Fixing a few bugs. Still need to check for the backtrack analysis.

diff --git a/src/main/gov/nasa/jpf/listener/StateReducer.java b/src/main/gov/nasa/jpf/listener/StateReducer.java
index 82e8cf87560a5d211b05d024b07050697d75fa0f..e594c28204e4807cdf83d56dd008aa753e06c49e 100644 (file)
--- a/src/main/gov/nasa/jpf/listener/StateReducer.java
+++ b/src/main/gov/nasa/jpf/listener/StateReducer.java
@@ -162,7 +162,7 @@ public class StateReducer extends ListenerAdapter {
     for(IntChoiceFromSet cg : cgMap.keySet()) {
       int event = cgMap.get(cg);
       LinkedList<Integer[]> choiceLists = backtrackMap.get(event);
-      if (choiceLists.peekFirst() != null) {
+      if (choiceLists != null && choiceLists.peekFirst() != null) {
         Integer[] choiceList = choiceLists.removeFirst();
         // Deploy the new choice list for this CG
         cg.setNewValues(choiceList);