From 7fea8fd9b175559b403e9bacc85ad1db88e59622 Mon Sep 17 00:00:00 2001 From: yeom Date: Tue, 26 Oct 2010 00:14:31 +0000 Subject: [PATCH] bug fix: RCR sets its proper conflict type. --- Robust/src/Analysis/OoOJava/ConflictGraph.java | 2 ++ 1 file changed, 2 insertions(+) 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; } -- 2.34.1