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 al...@apache.org on 2013/04/24 14:19:39 UTC

svn commit: r1471380 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java

Author: alexparvulescu
Date: Wed Apr 24 12:19:39 2013
New Revision: 1471380

URL: http://svn.apache.org/r1471380
Log:
OAK-795 Osgi init issues
 - temporarily disabled the NodeStore tracker

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java?rev=1471380&r1=1471379&r2=1471380&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java Wed Apr 24 12:19:39 2013
@@ -45,7 +45,8 @@ public class Activator implements Bundle
 
     private ServiceTracker microKernelTracker;
 
-    private ServiceTracker nodeStoreTracker;
+    // see OAK-795 for a reason why the nodeStore tracker is disabled 
+    // private ServiceTracker nodeStoreTracker;
 
     private final OsgiIndexProvider indexProvider = new OsgiIndexProvider();
 
@@ -71,14 +72,14 @@ public class Activator implements Bundle
         microKernelTracker = new ServiceTracker(
                 context, MicroKernel.class.getName(), this);
         microKernelTracker.open();
-        nodeStoreTracker = new ServiceTracker(
-                context, NodeStore.class.getName(), this);
-        nodeStoreTracker.open();
+        // nodeStoreTracker = new ServiceTracker(
+        // context, NodeStore.class.getName(), this);
+        // nodeStoreTracker.open();
     }
 
     @Override
     public void stop(BundleContext bundleContext) throws Exception {
-        nodeStoreTracker.close();
+        // nodeStoreTracker.close();
         microKernelTracker.close();
         indexProvider.stop();
         indexHookProvider.stop();