Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/jpf-core

diff --combined src/main/gov/nasa/jpf/listener/DPORStateReducer.java
index a8e93675828204be6e36918143903b0240568173,743d7bedd2536aac19bcf5f7256063276770fa7a..a54c7fa6b8f9375f47978d9101aeced24dc6d7b2
--- 1/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
--- 2/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
+++ b/src/main/gov/nasa/jpf/listener/DPORStateReducer.java
@@@ -196,8 -196,6 +196,8 @@@ public class DPORStateReducer extends L
        // Initialize with necessary information from the CG
        if (nextCG instanceof IntChoiceFromSet) {
          IntChoiceFromSet icsCG = (IntChoiceFromSet) nextCG;
 +        // Tell JPF that we are performing DPOR
 +        icsCG.setDpor();
          if (!isEndOfExecution) {
            // Check if CG has been initialized, otherwise initialize it
            Integer[] cgChoices = icsCG.getAllChoices();
@@@ -1167,7 -1165,8 +1167,8 @@@
                pushedExecution, pushedChoice, currRWSet, visited);
      }
      // Remove the transition after being explored
-     visited.remove(confTrans);
+     // TODO: Seems to cause a lot of loops---commented out for now
+     //visited.remove(confTrans);
    }
  
    // --- Functions related to the reachability analysis when there is a state match