From 7208239ff942a7eb60c652342970ae6afb1976ba Mon Sep 17 00:00:00 2001 From: amiraj Date: Fri, 18 Oct 2019 15:46:55 -0700 Subject: [PATCH] Fixing a bug in ConflictTracker.java --- src/main/gov/nasa/jpf/listener/ConflictTracker.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/gov/nasa/jpf/listener/ConflictTracker.java b/src/main/gov/nasa/jpf/listener/ConflictTracker.java index db47836..1343467 100644 --- 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. - 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; } -- 2.34.1