Fixing a bug in ConflictTracker.java

diff --git a/src/main/gov/nasa/jpf/listener/ConflictTracker.java b/src/main/gov/nasa/jpf/listener/ConflictTracker.java
index db478369ff5368eafb6a1f6e6e75c7af43ff6b84..134346775940c10aaf5acd5db90d67c8b16159b9 100644 (file)
--- a/src/main/gov/nasa/jpf/listener/ConflictTracker.java
+++ b/src/main/gov/nasa/jpf/listener/ConflictTracker.java
@@ -539,10 +539,13 @@ public class ConflictTracker extends ListenerAdapter {
 
   private void writeWriterAndValue(String writer, String value, String var) {
     // Update the temporary Set set.
 
   private void writeWriterAndValue(String writer, String value, String var) {
     // Update the temporary Set set.

-    if (writer.equals("App1"))
-      tempSetSet.add(new NameValuePair(1, value, var, manual));
-    else if (writer.equals("App2"))
-      tempSetSet.add(new NameValuePair(2, value, var, manual));
+    NameValuePair temp = new NameValuePair(1, value, var, manual);
+    if (writer.equals("App2"))
+       temp = new NameValuePair(2, value, var, manual);
+    
+    if (tempSetSet.contains(temp))
+       tempSetSet.remove(temp);
+    tempSetSet.add(temp);

     // Set isSet to true
     isSet = true;
   }
     // Set isSet to true
     isSet = true;
   }