From: stephey <stephey>
Date: Wed, 18 Aug 2010 02:09:28 +0000 (+0000)
Subject: Changed variable type to make more compatible with RCR
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f2aff7a8e3cfd2b397c2f8776145cae62b10f244;p=IRC.git

Changed variable type to make more compatible with RCR
---

diff --git a/Robust/src/Analysis/OoOJava/ConflictGraph.java b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index 0e8c9cf1..67e2691a 100644
--- a/Robust/src/Analysis/OoOJava/ConflictGraph.java
+++ b/Robust/src/Analysis/OoOJava/ConflictGraph.java
@@ -667,8 +667,8 @@ public class ConflictGraph {
               newElement.setStatus(seseLock.getNodeType(node));
               if (isFineElement(newElement.getStatus())) {
                 newElement.setDynID(node.getVar().toString());
-                newElement.setTempDesc(node.getVar());
               }
+              newElement.setTempDesc(node.getVar());
               waitingElementSet.add(newElement);
             }
           }
@@ -682,8 +682,8 @@ public class ConflictGraph {
     return waitingElementSet;
   }
 
-  public Hashtable<Taint, Set<Effect>> getConflictEffectSet(FlatSESEEnterNode fsen) {
-    return sese2te.get(fsen);
+  public Hashtable<Taint, Set<Effect>> getConflictEffectSet(FlatNode fn) {
+    return sese2te.get(fn);
   }
 
   public void writeGraph(String graphName, boolean filter) throws java.io.IOException {