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 ju...@apache.org on 2013/03/25 16:03:48 UTC

svn commit: r1460704 - /jackrabbit/oak/trunk/oak-sling/src/main/java/org/apache/jackrabbit/oak/sling/Activator.java

Author: jukka
Date: Mon Mar 25 15:03:48 2013
New Revision: 1460704

URL: http://svn.apache.org/r1460704
Log:
OAK-716: NPE when starting Oak repository in Sling

Patch by Ian Boston.

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

Modified: jackrabbit/oak/trunk/oak-sling/src/main/java/org/apache/jackrabbit/oak/sling/Activator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-sling/src/main/java/org/apache/jackrabbit/oak/sling/Activator.java?rev=1460704&r1=1460703&r2=1460704&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-sling/src/main/java/org/apache/jackrabbit/oak/sling/Activator.java (original)
+++ jackrabbit/oak/trunk/oak-sling/src/main/java/org/apache/jackrabbit/oak/sling/Activator.java Mon Mar 25 15:03:48 2013
@@ -25,6 +25,7 @@ import java.util.concurrent.ScheduledExe
 import javax.jcr.Repository;
 
 import org.apache.jackrabbit.oak.api.ContentRepository;
+import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.osgi.framework.BundleActivator;
@@ -56,7 +57,7 @@ public class Activator implements Bundle
     public void start(BundleContext bundleContext) throws Exception {
         context = bundleContext;
         executor = Executors.newScheduledThreadPool(1);
-        securityProvider = null; // TODO
+        securityProvider = new SecurityProviderImpl(); // TODO
         tracker = new ServiceTracker(
                 context, ContentRepository.class.getName(), this);
         tracker.open();