fix npes on shutdown

Change-Id: Ib3a518e5b155df3df4b1bd15cf2528acf7c2b153
Signed-off-by: Anton Tanasenko <atg.sleepless@gmail.com>

1 files changed, 13 insertions, 5 deletions

diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java
index 2427b352..59cfd023 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/MavenJdtPlugin.java
@@ -133,14 +133,22 @@ public class MavenJdtPlugin extends Plugin {
    * @noreference see class javadoc
    */
   public void stop(BundleContext context) throws Exception {
-    IWorkspace workspace = ResourcesPlugin.getWorkspace();
-    MavenProjectManager projectManager = MavenPluginActivator.getDefault().getMavenProjectManager();
-    projectManager.removeMavenProjectChangedListener(buildpathManager);
+    super.stop(context);
 
+    IWorkspace workspace = ResourcesPlugin.getWorkspace();
     workspace.removeResourceChangeListener(this.buildpathManager);
 
-    DebugPlugin.getDefault().getLaunchManager().removeLaunchConfigurationListener(launchConfigurationListener);
-    projectManager.removeMavenProjectChangedListener(launchConfigurationListener);
+    MavenPluginActivator mplugin = MavenPluginActivator.getDefault();
+    if(mplugin != null) {
+      MavenProjectManager projectManager = mplugin.getMavenProjectManager();
+      projectManager.removeMavenProjectChangedListener(buildpathManager);
+      projectManager.removeMavenProjectChangedListener(launchConfigurationListener);
+    }
+
+    DebugPlugin dplugin = DebugPlugin.getDefault();
+    if(dplugin != null) {
+      dplugin.getLaunchManager().removeLaunchConfigurationListener(launchConfigurationListener);
+    }
 
     this.buildpathManager = null;
     this.launchConfigurationListener = null;