From: yeom <yeom>
Date: Tue, 26 Oct 2010 00:14:31 +0000 (+0000)
Subject: bug fix: RCR sets its proper conflict type.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7fea8fd9b175559b403e9bacc85ad1db88e59622;p=IRC.git

bug fix: RCR sets its proper conflict type.
---

diff --git a/Robust/src/Analysis/OoOJava/ConflictGraph.java b/Robust/src/Analysis/OoOJava/ConflictGraph.java
index 7d49343b..ae569b8d 100644
--- a/Robust/src/Analysis/OoOJava/ConflictGraph.java
+++ b/Robust/src/Analysis/OoOJava/ConflictGraph.java
@@ -327,6 +327,7 @@ public class ConflictGraph {
                   if (!nodeA.equals(nodeB)) {
                     addCoarseEffect(nodeB, asB, effectB);
                   }
+                  conflictType=ConflictGraph.COARSE_GRAIN_EDGE;
                 } else {
                   return ConflictGraph.COARSE_GRAIN_EDGE;
                 }
@@ -439,6 +440,7 @@ public class ConflictGraph {
                   if (!nodeA.equals(nodeB)) {
                     addCoarseEffect(nodeB, asB, effectB);
                   }
+                  conflictType=ConflictGraph.COARSE_GRAIN_EDGE;
                 } else {
                   return ConflictGraph.COARSE_GRAIN_EDGE;
                 }