You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2016/12/09 09:43:47 UTC
svn commit: r1773349 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java
Author: tomekr
Date: Fri Dec 9 09:43:47 2016
New Revision: 1773349
URL: http://svn.apache.org/viewvc?rev=1773349&view=rev
Log:
OAK-5254: MultiplexingNodeStoreService does not pick up Observers registered through the whiteboard
Patch provided by rombert@apache.org
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java?rev=1773349&r1=1773348&r2=1773349&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java Fri Dec 9 09:43:47 2016
@@ -24,6 +24,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
+import org.apache.jackrabbit.oak.osgi.ObserverTracker;
import org.apache.jackrabbit.oak.spi.mount.Mount;
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -67,6 +68,8 @@ public class MultiplexingNodeStoreServic
private ServiceRegistration nsReg;
+ private ObserverTracker observerTracker;
+
@Activate
protected void activate(ComponentContext context) {
this.context = context;
@@ -125,13 +128,18 @@ public class MultiplexingNodeStoreServic
props.put(Constants.SERVICE_PID, MultiplexingNodeStore.class.getName());
props.put("oak.nodestore.description", new String[] { "nodeStoreType=multiplexing" } );
+ MultiplexingNodeStore store = builder.build();
+
+ observerTracker = new ObserverTracker(store);
+ observerTracker.start(context.getBundleContext());
+
LOG.info("Registering the multiplexing node store");
nsReg = context.getBundleContext().registerService(
new String[]{
NodeStore.class.getName()
},
- builder.build(),
+ store,
props);
}
@@ -157,6 +165,10 @@ public class MultiplexingNodeStoreServic
nsReg.unregister();
nsReg = null;
}
+ if (observerTracker != null) {
+ observerTracker.stop();
+ observerTracker = null;
+ }
}
protected void bindNodeStore(NodeStoreProvider ns, Map<String, ?> config) {