From: yeom <yeom>
Date: Wed, 20 Oct 2010 17:41:16 +0000 (+0000)
Subject: more changes for RCR
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=dd6f48af15d1920c05420ae9a779a7a06bab2825;p=IRC.git

more changes for RCR
---

diff --git a/Robust/src/Analysis/OoOJava/ConflictGraph.java b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index d531c016..7b30add5 100644
--- a/Robust/src/Analysis/OoOJava/ConflictGraph.java
+++ b/Robust/src/Analysis/OoOJava/ConflictGraph.java
@@ -566,8 +566,7 @@ public class ConflictGraph {
 
     // handle the case that multiple enqueues by an SESE for different live-in
     // into the same queue
-    return refineQueue(waitingElementSet);
-    // return waitingElementSet;
+     return refineQueue(waitingElementSet);  
 
   }
 
@@ -587,13 +586,14 @@ public class ConflictGraph {
       map.put(new Integer(waitingElement.getQueueID()), set);
     }
 
-    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);
+    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);
+      }
     }
-
     return seseDS;
   }