Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F0494F761 for ; Wed, 24 Apr 2013 12:20:07 +0000 (UTC) Received: (qmail 58499 invoked by uid 500); 24 Apr 2013 12:20:07 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 58413 invoked by uid 500); 24 Apr 2013 12:20:05 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 58319 invoked by uid 99); 24 Apr 2013 12:20:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Apr 2013 12:20:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Apr 2013 12:20:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A755023888E7; Wed, 24 Apr 2013 12:19:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1471380 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java Date: Wed, 24 Apr 2013 12:19:39 -0000 To: oak-commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130424121939.A755023888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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();