From aa349fc2b3305dd92de8f3f7106bb69d15adc3f8 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Fri, 20 Feb 2004 17:35:44 +0000
Subject: [PATCH] Partial fix for PR 52155.

---
 debug/org.eclipse.cdt.debug.ui/ChangeLog         |  6 ++++++
 .../org/eclipse/cdt/debug/ui/CDebugUIPlugin.java | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index f150f34b80b..1432043ef57 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-20 Alain Magloire
+	Partial Fix for #52155, we simply catch the exception.
+	We do not worry about it too much since this code will
+	be rewritten part of catching up with Eclipse 3.0
+	* CDebugUIPlugin.java: shutdown()
+
 2004-02-16 Mikhail Khodjaiants
 	Fix for bug 52135: Debugger should indicate which thread triggered breakpoint.
 	* CDTDebugModelPresentation.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
index a31175776ef..825a2545a75 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
@@ -324,14 +324,22 @@ public class CDebugUIPlugin extends AbstractUIPlugin
 	public void shutdown() throws CoreException
 	{
 		DebugPlugin.getDefault().removeDebugEventListener( this );
-		IWorkbenchWindow ww = getActiveWorkbenchWindow();
-		if ( ww != null )
+		// TODO: PR 52155, this is big hammer approach, but it is ok for
+		// Since the code will be remove when we align ourselves
+		// with Eclipse-3.0
+		try 
 		{
-			ww.getSelectionService().removeSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this );
+			IWorkbenchWindow ww = getActiveWorkbenchWindow();
+			if ( ww != null )
+			{
+				ww.getSelectionService().removeSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this );
+			}
+		} catch (Exception e) {
+			// Big hammer.
 		}
 		if ( fImageDescriptorRegistry != null )
 		{
-			fImageDescriptorRegistry.dispose();
+				fImageDescriptorRegistry.dispose();
 		}
 		CDebugCorePlugin.getDefault().setAsyncExecutor( null );
 		super.shutdown();