aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Piech2013-01-22 11:40:19 (EST)
committerDani Megert2013-01-22 11:47:16 (EST)
commit74573dd6051f576108bc315f1fdc478fb3f5ebb3 (patch)
tree3ecd13e17d518289935195c600e843337b0c726f
parent026cca5522660c2d4377f470479fd5ed386e3136 (diff)
downloadeclipse.platform.debug-74573dd6051f576108bc315f1fdc478fb3f5ebb3.zip
eclipse.platform.debug-74573dd6051f576108bc315f1fdc478fb3f5ebb3.tar.gz
eclipse.platform.debug-74573dd6051f576108bc315f1fdc478fb3f5ebb3.tar.bz2
Fixed bug 398515: Add workaround in Debug UI for bug 398776: Workbench
starts IStartup plug-ins before it is fully initialized (was: Race condition in DebugUIPlugin.start() can cause Debug plugins to not get loaded properly)
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
index 65704a3..b2a9e55 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/contextlaunching/LaunchingResourceManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -549,7 +549,9 @@ public class LaunchingResourceManager implements IPropertyChangeListener, IWindo
// initialize for already open windows
IWorkbenchWindow[] workbenchWindows = workbench.getWorkbenchWindows();
for (int i = 0; i < workbenchWindows.length; i++) {
- windowOpened(workbenchWindows[i]);
+ if (workbenchWindows[i].getSelectionService() != null) {
+ windowOpened(workbenchWindows[i]);
+ }
}
}
DebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);