You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2017/10/10 11:29:54 UTC
svn commit: r1811671 -
/sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
Author: stefanegli
Date: Tue Oct 10 11:29:54 2017
New Revision: 1811671
URL: http://svn.apache.org/viewvc?rev=1811671&view=rev
Log:
SLING-7153 : ignoring TopologyEvent entirely when not activated - representing a more appropriate fix for resourceResolverFactory being null case
Modified:
sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
Modified: sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java?rev=1811671&r1=1811670&r2=1811671&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java (original)
+++ sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/TopologyWebConsolePlugin.java Tue Oct 10 11:29:54 2017
@@ -589,6 +589,10 @@ public class TopologyWebConsolePlugin ex
*/
@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 @@ public class TopologyWebConsolePlugin ex
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();