commit | 9573092b6e849b45ab1430988d027c617643510c | [log] [tgz] |
---|---|---|
author | eyuen <eyuen> | Thu Jul 21 21:02:32 2011 +0000 |
committer | eyuen <eyuen> | Thu Jul 21 21:02:32 2011 +0000 |
tree | 4b43373f877bc10267ea7c63a4c582ab6f0f66b2 | |
parent | b042fa66b14b82db252cd39578c45799150d822b [diff] |
[344002] AssertionFailed during shutdown of Eclipse
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 4638ce6..356f84a 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
@@ -409,11 +409,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); }