1 files changed, 9 insertions, 6 deletions
diff --git a/org.eclipse.cdt.codan.extension/src/org/eclipse/cdt/codan/extension/checkers/CloseOpenedFilesChecker.java b/org.eclipse.cdt.codan.extension/src/org/eclipse/cdt/codan/extension/checkers/CloseOpenedFilesChecker.java
index 5ea8e79..491a481 100644
--- a/org.eclipse.cdt.codan.extension/src/org/eclipse/cdt/codan/extension/checkers/CloseOpenedFilesChecker.java
+++ b/org.eclipse.cdt.codan.extension/src/org/eclipse/cdt/codan/extension/checkers/CloseOpenedFilesChecker.java
@@ -210,7 +210,7 @@ public class CloseOpenedFilesChecker extends AbstractIndexAstChecker {
 	}
 
 	private Set<SymbolicState> group(Set<SymbolicState> ss) {
-		return groupPSA(ss);
+		return groupPropSim(ss);
 	}
 	
 	private Set<SymbolicState> groupPSA(Set<SymbolicState> ss) {
@@ -236,12 +236,15 @@ public class CloseOpenedFilesChecker extends AbstractIndexAstChecker {
 		for (PropertyState p : statesPerProperty.keySet()) {
 			Set<PropertyState> ps = new HashSet<PropertyState>();
 			ps.add(p);
-			ExecutionState es = new ExecutionState();
-			for (ExecutionState e : statesPerProperty.get(p)) {
-				es.join(e);
+			Set<ExecutionState> es = statesPerProperty.get(p);
+			if (es.size() > 1) {
+				// Join execution states in this set
+				es = ExecutionState.join(es);
+			}
+			for (ExecutionState e : es) {
+				SymbolicState s = new SymbolicState(ps, e);
+				ret.add(s);
 			}
-			SymbolicState s = new SymbolicState(ps, es);
-			ret.add(s);
 		}		
 		
 		return ret;