aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Besedin2012-09-26 10:27:14 (EDT)
committerOleg Besedin2012-09-26 10:27:14 (EDT)
commit8f25fbc4d8ff121d8cbe86c2e1e931d12998b1fb (patch)
tree1f5939b37de3d3f682927889fe6e32ef706e8068
parent78c099995ee3e0a25e88fb4e7c963fbeb4bcbf70 (diff)
downloadeclipse.platform.ui-8f25fbc4d8ff121d8cbe86c2e1e931d12998b1fb.zip
eclipse.platform.ui-8f25fbc4d8ff121d8cbe86c2e1e931d12998b1fb.tar.gz
eclipse.platform.ui-8f25fbc4d8ff121d8cbe86c2e1e931d12998b1fb.tar.bz2
Bug 389250 - Lots of stuff leaked when closing and reopening viewsv20120926-142714
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java3
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
index bed87ab..39a1a89 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
@@ -723,10 +723,11 @@ public final class Workbench extends EventManager implements IWorkbench {
StartupMonitor startupMonitor = new StartupMonitor() {
public void applicationRunning() {
- // splash.dispose();
if (background != null)
background.dispose();
registration[0].unregister(); // unregister ourself
+ if (splash != null)
+ splash.dispose();
WorkbenchPlugin.unsetSplashShell(display);
// fire part visibility events now that we're up
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java
index ec88b17..d5a6ce9 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/splash/BasicSplashHandler.java
@@ -186,9 +186,9 @@ public abstract class BasicSplashHandler extends AbstractSplashHandler {
* @see org.eclipse.ui.splash.AbstractSplashHandler#dispose()
*/
public void dispose() {
- super.dispose();
if (foreground != null)
foreground.dispose();
+ super.dispose();
}
/**