commit 7e6458529d28b90280bceba4a7ba442b30e7ecda
author eyuen <eyuen> Thu Jul 21 21:07:29 2011 +0000
committer eyuen <eyuen> Thu Jul 21 21:07:29 2011 +0000
tree 406dc2b8cba342206e3be702e0dffa62df1c4d5b
parent 2e4aff4332ed716dd631a285c5f710e1bcaa927a

[344002] AssertionFailed during shutdown of Eclipse

plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java

diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
index 70d6f7d..1e35827 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
@@ -399,11 +399,12 @@
 			return;
 		}
 
-		if (resourceChangeListener != null) {
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			if (workspace != null)
-				workspace.removeResourceChangeListener(resourceChangeListener);
-			
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		if (workspace != null && resourceChangeListener != null) {
+			workspace.removeResourceChangeListener(resourceChangeListener);
+		}
+
+		if (pcl != null) {
 			ServerPlugin.getInstance().getPluginPreferences().removePropertyChangeListener(pcl);
 		}