From: yeom <yeom>
Date: Wed, 20 Oct 2010 23:15:31 +0000 (+0000)
Subject: changes. assign tempDescriptor to coarse waiting element
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0bb6ab852f594856b548e10d76114f87fc08ecf1;p=IRC.git

changes. assign tempDescriptor to coarse waiting element
---

diff --git a/Robust/src/Analysis/OoOJava/ConflictGraph.java b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index 7b30add5..81696a2a 100644
--- 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;
   }