Bug 336584 - [Contributions] CommandContributionItem#openDropDownMenu()

never release menu manager

Release it in an asyncExec

1 files changed, 10 insertions, 2 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java
index 669554ab5fd..1ddf6f14e7c 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java
@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuListener2;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.bindings.BindingManagerEvent;
@@ -867,7 +867,7 @@ public class CommandContributionItem extends ContributionItem {
 					if (workbenchHelpSystem != null) {
 						workbenchHelpSystem.setHelp(menu, helpContextId);
 					}
-					menuManager.addMenuListener(new IMenuListener() {
+					menuManager.addMenuListener(new IMenuListener2() {
 						public void menuAboutToShow(IMenuManager manager) {
 							String id = getId();
 							if (dropDownMenuOverride != null) {
@@ -876,6 +876,14 @@ public class CommandContributionItem extends ContributionItem {
 							menuService.populateContributionManager(
 									menuManager, "menu:" + id); //$NON-NLS-1$
 						}
+						public void menuAboutToHide(IMenuManager manager) {
+							display.asyncExec(new Runnable() {
+								public void run() {
+									menuService.releaseContributions(menuManager);
+									menuManager.dispose();
+								}
+							});
+						}
 					});
 
 					// position the menu below the drop down item