commit 3f6c3779ff3bcc33a6da71aff4ed2bd2d2335c64
author jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Thu Jan 10 16:16:32 2013 +0000
committer jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Thu Jan 10 16:16:32 2013 +0000
tree 4034b4bbbd94850f7466ee3d956f8ef74efb27d0
parent 0c8a80014893b351ad02748ec1364c01b51eaf74

[KARAF-2098] Fix NPE on the KarafRemoteConsole

git-svn-id: https://svn.apache.org/repos/asf/karaf/eik/trunk@1431471 13f79535-47bb-0310-9956-ffa450edef68

plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/console/KarafRemoteConsole.java

diff --git a/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/console/KarafRemoteConsole.java b/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/console/KarafRemoteConsole.java
index 5c2f510..50824c5 100644
--- a/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/console/KarafRemoteConsole.java
+++ b/plugins/org.apache.karaf.eik.ui/src/main/java/org/apache/karaf/eik/ui/console/KarafRemoteConsole.java
@@ -232,7 +232,9 @@
     protected void dispose() {
         super.dispose();
 
-        DebugPlugin.getDefault().removeDebugEventListener(this);
+        if (DebugPlugin.getDefault() != null) {
+            DebugPlugin.getDefault().removeDebugEventListener(this);
+        }
     }
 
     @Override