From: stephey <stephey>
Date: Wed, 23 Mar 2011 01:00:01 +0000 (+0000)
Subject: Jim told me to do this...
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0241f36d26cd8dafdbe93ed53c1b4d1321d163f7;p=IRC.git

Jim told me to do this...
---

diff --git a/Robust/src/Analysis/Disjoint/SMFEState.java b/Robust/src/Analysis/Disjoint/SMFEState.java
index 9f9818f2..cce0a082 100644
--- a/Robust/src/Analysis/Disjoint/SMFEState.java
+++ b/Robust/src/Analysis/Disjoint/SMFEState.java
@@ -62,6 +62,7 @@ public class SMFEState {
     this.iHashCode  = fnWhereDefined.hashCode();
 
     effects         = new HashSet<Effect>();
+    conflicts       = new HashSet<Effect>();
     e2states        = new Hashtable< Effect, Set<SMFEState> >();
     refCount        = 0;
   }
@@ -98,6 +99,8 @@ public class SMFEState {
   }
   
   public Set<Effect> getConflicts() {
+    //TODO JIM! Fix this when have a chance!
+    conflicts.addAll(effects);
     return this.conflicts;
   }