Fix NPE during shutdown from PomImportMonitor

1 files changed, 5 insertions, 2 deletions

diff --git a/org.eclipse.m2e.usagedata/src/org/eclipse/m2e/internal/udc/PomImportMonitor.java b/org.eclipse.m2e.usagedata/src/org/eclipse/m2e/internal/udc/PomImportMonitor.java
index 6fc971ca..66fb5e3d 100644
--- a/org.eclipse.m2e.usagedata/src/org/eclipse/m2e/internal/udc/PomImportMonitor.java
+++ b/org.eclipse.m2e.usagedata/src/org/eclipse/m2e/internal/udc/PomImportMonitor.java
@@ -29,7 +29,10 @@ public class PomImportMonitor implements UsageMonitor {
   }
 
   public void stopMonitoring() {
-    MavenUsageDataCollectorActivator.getDefault().setUsageDataService(null);
+    // Null check to avoid NPE in shutdown 
+    MavenUsageDataCollectorActivator instance = MavenUsageDataCollectorActivator.getDefault();
+    if(instance != null) {
+      MavenUsageDataCollectorActivator.getDefault().setUsageDataService(null);
+    }
   }
-
 }