rolling back last fix for Bug 295117 - deadlock in CfgDiscoveredPathManager.getDiscoveredInfo()

1 files changed, 7 insertions, 7 deletions

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java
index e270515acd5..23a85606e6b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java
@@ -57,16 +57,16 @@ public class SelectionListenerWithASTManager {
 	
 	private static class SingletonRule implements ISchedulingRule {
 		public boolean contains(ISchedulingRule rule) {
-			return rule == this;
-		}
-		public boolean isConflicting(ISchedulingRule rule) {
-			if (rule instanceof SingletonRule) {
+			//if(rule instanceof SingletonRule) {
 				return rule == this;
-			}
+			/*}
 			
 			else {
-				return false;
-			}
+				return true;
+			}*/
+		}
+		public boolean isConflicting(ISchedulingRule rule) {
+			return rule == this;
 		}
 	}