svn commit: r908440 - /sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java

[fmeschbe]

Author: fmeschbe
Date: Wed Feb 10 10:36:51 2010
New Revision: 908440

URL: http://svn.apache.org/viewvc?rev=908440&view=rev
Log:
SLING-1363 Must start the session configurer tracker before starting the 
repository because starting the repository tries to login which in turn 
accesses the tracker thus causing an NPE.

Modified:
    
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java

Modified: 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java?rev=908440&r1=908439&r2=908440&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
 (original)
+++ 
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
 Wed Feb 10 10:36:51 2010
@@ -572,6 +572,9 @@
 
         componentContext.getBundleContext().addBundleListener(this);
 
+        this.sessionConfigurerTracker = new 
ServiceTracker(componentContext.getBundleContext(), 
SessionConfigurer.SERVICE_NAME, null);
+        this.sessionConfigurerTracker.open();
+
         // immediately try to start the repository while activating
         // this component instance
         try {
@@ -586,9 +589,6 @@
                 "activate: Unexpected problem starting repository", t);
         }
 
-        this.sessionConfigurerTracker = new 
ServiceTracker(componentContext.getBundleContext(), 
SessionConfigurer.SERVICE_NAME, null);
-        this.sessionConfigurerTracker.open();
-
         // launch the background repository checker now
         startRepositoryPinger();
     }