svn commit: r1059807 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

[th...@apache.org]

Author: thomasm
Date: Mon Jan 17 08:19:45 2011
New Revision: 1059807

URL: http://svn.apache.org/viewvc?rev=1059807&view=rev
Log:
JCR-2862 Jackrabbit logs a NullPointerException on shutdown if the version manager wasn't initialized

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=1059807&r1=1059806&r2=1059807&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Mon Jan 17 08:19:45 2011
@@ -104,6 +104,7 @@ import org.apache.jackrabbit.core.state.
 import org.apache.jackrabbit.core.state.ManagedMLRUItemStateCacheFactory;
 import org.apache.jackrabbit.core.state.SharedItemStateManager;
 import org.apache.jackrabbit.core.util.RepositoryLockMechanism;
+import org.apache.jackrabbit.core.version.InternalVersionManager;
 import org.apache.jackrabbit.core.version.InternalVersionManagerImpl;
 import org.apache.jackrabbit.core.xml.ClonedInputSource;
 import org.apache.jackrabbit.spi.commons.name.NameConstants;
@@ -1122,7 +1123,10 @@ public class RepositoryImpl extends Abst
         }
 
         try {
-            context.getInternalVersionManager().close();
+            InternalVersionManager m = context.getInternalVersionManager();
+            if (m != null) {
+                m.close();
+            }
         } catch (Exception e) {
             log.error("Error while closing Version Manager.", e);
         }