Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Recoskie2009-11-30 16:18:06 -0500
committerChris Recoskie2009-11-30 16:18:06 -0500
commitb8d63e97b0deeb7c6d2452e2f8223122e4eb40b7 (patch)
tree9e3148c089943b462ce718ee2241cc73f262a4e7
parentc31685bbf06878991f5d079df7c3156a0a291034 (diff)
downloadorg.eclipse.cdt-b8d63e97b0deeb7c6d2452e2f8223122e4eb40b7.tar.gz
org.eclipse.cdt-b8d63e97b0deeb7c6d2452e2f8223122e4eb40b7.tar.xz
org.eclipse.cdt-b8d63e97b0deeb7c6d2452e2f8223122e4eb40b7.zip
another fix for Bug 295117 - deadlock in CfgDiscoveredPathManager.getDiscoveredInfo()v200911301622
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java8
1 files changed, 7 insertions, 1 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 4c45c78271..e270515acd 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
@@ -60,7 +60,13 @@ public class SelectionListenerWithASTManager {
return rule == this;
}
public boolean isConflicting(ISchedulingRule rule) {
- return rule == this;
+ if (rule instanceof SingletonRule) {
+ return rule == this;
+ }
+
+ else {
+ return false;
+ }
}
}

Back to the top