commit cf867fdff73b12410c4802218defe91a16d24398
Author: Stuart McCulloch <mcculls@gmail.com>
Date:   Mon Jul 20 16:33:42 2015 +0100

    KARAF-3864: check if we're in a shutdown situation before checking isEnabled

diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
index c5473f9..39c2f56 100644
--- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
+++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
@@ -48,17 +48,17 @@ public class LocalBundleListener extends BundleSupport implements SynchronousBun
     @Override
     public void bundleChanged(BundleEvent event) {
 
-        if (!isEnabled()) {
-            LOGGER.debug("CELLAR BUNDLE: local listener is disabled");
-            return;
-        }
-
         if (event.getBundle().getBundleId() == 0 && (event.getType() == BundleEvent.STOPPING || event.getType() == BundleEvent.STOPPED)) {
             LOGGER.debug("CELLAR BUNDLE: Karaf shutdown detected, removing Cellar LocalBundleListener");
             bundleContext.removeBundleListener(this);
             return;
         }
 
+        if (!isEnabled()) {
+            LOGGER.debug("CELLAR BUNDLE: local listener is disabled");
+            return;
+        }
+
         if (event.getBundle().getBundleId() == 0) {
             return;
         }