svn commit: r1732055 - /jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/NodeStateSolrServersObserverService.java

[tommaso]

Author: tommaso
Date: Wed Feb 24 10:30:43 2016
New Revision: 1732055

URL: http://svn.apache.org/viewvc?rev=1732055&view=rev
Log:
OAK-4051 - fixed wrong 'enabled' property retrieval

Modified:
    
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/NodeStateSolrServersObserverService.java

Modified: 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/NodeStateSolrServersObserverService.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/NodeStateSolrServersObserverService.java?rev=1732055&r1=1732054&r2=1732055&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/NodeStateSolrServersObserverService.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/NodeStateSolrServersObserverService.java
 Wed Feb 24 10:30:43 2016
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.oak.spi.whi
 import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardExecutor;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.component.ComponentContext;
 
 /**
  * An OSGi service for {@link 
org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate.NodeStateSolrServersObserver}.
@@ -55,11 +56,12 @@ public class NodeStateSolrServersObserve
     private static final String ENABLED = "enabled";
 
     @Activate
-    protected void activate(BundleContext bundleContext) throws Exception {
+    protected void activate(ComponentContext componentContext) throws 
Exception {
 
-        boolean enabled = PropertiesUtil.toBoolean(ENABLED, false);
+        boolean enabled = 
PropertiesUtil.toBoolean(componentContext.getProperties().get(ENABLED), false);
 
         if (enabled) {
+            BundleContext bundleContext = componentContext.getBundleContext();
             Whiteboard whiteboard = new OsgiWhiteboard(bundleContext);
             executor = new WhiteboardExecutor();
             executor.start(whiteboard);