changes. assign tempDescriptor to coarse waiting element

[IRC.git] / Robust / src / Analysis / OoOJava / ConflictGraph.java

diff --git a/Robust/src/Analysis/OoOJava/ConflictGraph.java b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index 7b30add54025e724ff24f6b66a13639fa830e1a1..81696a2a3f4f848cc06e8afcf67ea3941ea6d4b4 100644 (file)
--- a/Robust/src/Analysis/OoOJava/ConflictGraph.java
+++ b/Robust/src/Analysis/OoOJava/ConflictGraph.java
@@ -547,9 +547,9 @@ public class ConflictGraph {
                 WaitingElement newElement = new WaitingElement();
                 newElement.setQueueID(seseLock.getID());
                 newElement.setStatus(seseLock.getNodeType(node));
+                newElement.setTempDesc(node.getVar());
                 if (isFineElement(newElement.getStatus())) {
-                  newElement.setDynID(node.getVar().toString());
-                  newElement.setTempDesc(node.getVar());
+                  newElement.setDynID(node.getVar().toString());                  
                 }
                 if (!waitingElementSet.contains(newElement)) {
                   waitingElementSet.add(newElement);
@@ -586,13 +586,11 @@ public class ConflictGraph {
       map.put(new Integer(waitingElement.getQueueID()), set);
     }
 
-    if(!state.RCR){
-      Set<Integer> keySet = map.keySet();
-      for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
-        Integer queueID = (Integer) iterator.next();
-        Set<WaitingElement> queueWEset = map.get(queueID);
-        refineQueue(queueID.intValue(), queueWEset, seseDS);
-      }
+    Set<Integer> keySet = map.keySet();
+    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
+      Integer queueID = (Integer) iterator.next();
+      Set<WaitingElement> queueWEset = map.get(queueID);
+      refineQueue(queueID.intValue(), queueWEset, seseDS);
     }
     return seseDS;
   }