commit 403c47a9e932a3be76bf4fadb7117f1c0fda41c2
author Stefan Egli <stefanegli@apache.org> Tue Oct 10 11:29:54 2017 +0000
committer Stefan Egli <stefanegli@apache.org> Tue Oct 10 11:29:54 2017 +0000
tree 65b3d829be88ad0a93f90b5fbd278eeba8f2d50f
parent a7799e0694a441afdcb79991f2fc70d8d9e542ab

SLING-7153 : ignoring TopologyEvent entirely when not activated - representing a more appropriate fix for resourceResolverFactory being null case

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

src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java

diff --git a/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java b/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
index 7294e8e..2a3e073 100644
--- a/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
@@ -589,6 +589,10 @@
      */
     @Override
     public void handleTopologyEvent(final TopologyEvent event) {
+        if (getBundleContext() == null) {
+            logger.info("handleTopologyEvent: ignoring event when not activated: " + event);
+            return;
+        }
         if (event.getType() == Type.PROPERTIES_CHANGED) {
             this.currentView = event.getNewView();
 
@@ -786,11 +790,7 @@
                 discoveryLiteHistory.remove(0);
             }
         } catch(Exception e) {
-            if (resourceResolverFactory == null) {
-                logger.info("addDiscoveryLiteHistoryEntry: plugin already deactivated (resourceResolverFactory == null), Exception: "+e);
-            } else {
-                logger.error("addDiscoveryLiteHistoryEntry: Exception: "+e, e);
-            }
+            logger.error("addDiscoveryLiteHistoryEntry: Exception: "+e, e);
         } finally {
             if (resourceResolver != null) {
                 resourceResolver.close();