svn commit: r1716845 - /jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java

[chetanm]

Author: chetanm
Date: Fri Nov 27 11:36:35 2015
New Revision: 1716845

URL: http://svn.apache.org/viewvc?rev=1716845&view=rev
Log:
OAK-3689 - OakOSGiRepositoryFactory shutting down the repository twice

Reorder the null check as in case of shutdown the object would get removed

Modified:
    
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java

Modified: 
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java?rev=1716845&r1=1716844&r2=1716845&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
 Fri Nov 27 11:36:35 2015
@@ -459,13 +459,7 @@ public class OakOSGiRepositoryFactory im
                 obj = initialService;
             }
 
-            checkNotNull(obj, "Repository service is not available");
-
             final String name = method.getName();
-            if ("getServiceRegistry".equals(name)){
-                return tracker.getRegistry();
-            }
-
             //If shutdown then close the framework and return
             //Repository would be shutdown by the owning OSGi
             //component like RepositoryManager
@@ -474,6 +468,11 @@ public class OakOSGiRepositoryFactory im
                 return null;
             }
 
+            if ("getServiceRegistry".equals(name)){
+                return tracker.getRegistry();
+            }
+
+            checkNotNull(obj, "Repository service is not available");
             return method.invoke(obj, args);
         }