X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fmain%2Fgov%2Fnasa%2Fjpf%2Flistener%2FDPORStateReducer.java;h=362da3b247b00d42aa2d43ad10f155a8103edf87;hb=d5bff4fb65cff43b56e7a4fd7fd79b2faf7e4bdb;hp=feb51c7dce811ee418eddc5751c5f1c00eb89a38;hpb=fa86b972ca0ced9985639d19684ed1e4fc8cad56;p=jpf-core.git

diff --git a/src/main/gov/nasa/jpf/listener/DPORStateReducer.java b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
index feb51c7..362da3b 100644
--- a/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
+++ b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
@@ -699,7 +699,7 @@ public class DPORStateReducer extends ListenerAdapter {
   private void resetStatesForNewExecution(IntChoiceFromSet icsCG) {
     if (choices == null || choices != icsCG.getAllChoices()) {
       // Reset state variables
-      choiceCounter = 0;
+      choiceCounter = 1;
       choices = icsCG.getAllChoices();
       refChoices = copyChoices(choices);
       // Clearing data structures
@@ -708,6 +708,8 @@ public class DPORStateReducer extends ListenerAdapter {
       readWriteFieldsMap.clear();
       stateToEventMap.clear();
       isEndOfExecution = false;
+			// Adding this CG as the first CG for this execution
+			cgList.add(icsCG);
     }
   }