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

[jukka]

Author: jukka
Date: Mon Mar  4 10:06:41 2013
New Revision: 1452228

URL: http://svn.apache.org/r1452228
Log:
OAK-593: Segment-based MK

It looks like Felix has trouble with a null return value from addingService(), 
so let's not do that.

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=1452228&r1=1452227&r2=1452228&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
 Mon Mar  4 10:06:41 2013
@@ -115,8 +115,6 @@ public class Activator implements Bundle
                     ContentRepository.class.getName(),
                     oak.createContentRepository(),
                     new Properties()));
-        } else {
-            service = null;
         }
         return service;
     }