change so that new analysis runs for all benchmarks

diff --git a/Robust/src/Analysis/OoOJava/ConflictGraph.java b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index 9492990e0b74ffc1618a6b164f75d96ac3a26cc7..0eeb454909fd00345c154d2e57b3c7a2bfee05c8 100644 (file)
--- a/Robust/src/Analysis/OoOJava/ConflictGraph.java
+++ b/Robust/src/Analysis/OoOJava/ConflictGraph.java
@@ -405,7 +405,8 @@ public class ConflictGraph {
             Effect effectB = (Effect) iterator2.next();
 
             if (effectA.getAffectedAllocSite().equals(effectB.getAffectedAllocSite())
-                && effectA.getField().equals(effectB.getField())) {
+                && ((effectA.getField()!=null&&effectB.getField()!=null&&effectA.getField().equals(effectB.getField()))||
+                   (effectA.getField()==null&&effectB.getField()==null))) {
 
               if (useReachInfo) {
                 FlatNew fnRoot1 = asA.getFlatNew();