Bug 390586 - [Performance] (sub-) action bars not disposed

The default page rec should be disposed and removed from the appropriate
map files.

1 files changed, 9 insertions, 0 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java
index 18fb9605862..e4120d2853b 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/part/PageBookView.java
@@ -509,6 +509,15 @@ public abstract class PageBookView extends ViewPart implements IPartListener {
 			// check for null since the default page may not have
 			// been created (ex. perspective never visible)
 			defaultPageRec.page.dispose();
+			Object site = mapPageToSite.remove(defaultPageRec.page);
+			mapPageToNumRecs.remove(defaultPageRec.page);
+			if (defaultPageRec.subActionBars != null) {
+				defaultPageRec.subActionBars.dispose();
+			}
+
+			if (site instanceof PageSite) {
+				((PageSite) site).dispose();
+			}
 			defaultPageRec = null;
 		}
 		Map clone = (Map) ((HashMap) mapPartToRec).clone();