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 ch...@apache.org on 2016/10/19 15:13:34 UTC
svn commit: r1765656 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java
Author: chetanm
Date: Wed Oct 19 15:13:34 2016
New Revision: 1765656
URL: http://svn.apache.org/viewvc?rev=1765656&view=rev
Log:
OAK-1312 - Bundle nodes into a document
Switch to Observable
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java?rev=1765656&r1=1765655&r2=1765656&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java Wed Oct 19 15:13:34 2016
@@ -39,7 +39,6 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.commit.SubtreeEditor;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -76,7 +75,7 @@ public class BundlingConfigHandler imple
return new BundlingHandler(registry);
}
- public void initialize(NodeStore nodeStore, Executor executor) {
+ public void initialize(Observable nodeStore, Executor executor) {
registerObserver(nodeStore, executor);
//If bundling is disabled then initialize would not be invoked
//NOOP registry would get used effectively disabling bundling for
@@ -111,11 +110,9 @@ public class BundlingConfigHandler imple
log.info("Refreshing the BundledTypesRegistry");
}
- private void registerObserver(NodeStore nodeStore, Executor executor) {
- if (nodeStore instanceof Observable) {
- backgroundObserver = new BackgroundObserver(this, executor, 5);
- observerRegistration = ((Observable) nodeStore).addObserver(backgroundObserver);
- }
+ private void registerObserver(Observable observable, Executor executor) {
+ backgroundObserver = new BackgroundObserver(this, executor, 5);
+ observerRegistration = observable.addObserver(backgroundObserver);
}
}