Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Recoskie2009-11-30 20:10:17 -0500
committerChris Recoskie2009-11-30 20:10:17 -0500
commit540116c6a6ae2913b93244f31f2dcb098534d18e (patch)
treed89c84c4843bcafc42d5229219bf7e1fce72698d
parentb8d63e97b0deeb7c6d2452e2f8223122e4eb40b7 (diff)
downloadorg.eclipse.cdt-540116c6a6ae2913b93244f31f2dcb098534d18e.tar.gz
org.eclipse.cdt-540116c6a6ae2913b93244f31f2dcb098534d18e.tar.xz
org.eclipse.cdt-540116c6a6ae2913b93244f31f2dcb098534d18e.zip
rolling back last fix for Bug 295117 - deadlock in CfgDiscoveredPathManager.getDiscoveredInfo()
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java14
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 e270515acd..23a85606e6 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;
}
}

Back to the top