You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2009/06/09 11:38:55 UTC

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

Author: thomasm
Date: Tue Jun  9 09:38:53 2009
New Revision: 782930

URL: http://svn.apache.org/viewvc?rev=782930&view=rev
Log:
JCR-2127 DataStore.close() is never called

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=782930&r1=782929&r2=782930&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 Tue Jun  9 09:38:53 2009
@@ -39,6 +39,7 @@
 import org.apache.jackrabbit.core.config.VersioningConfig;
 import org.apache.jackrabbit.core.config.WorkspaceConfig;
 import org.apache.jackrabbit.core.data.DataStore;
+import org.apache.jackrabbit.core.data.DataStoreException;
 import org.apache.jackrabbit.core.fs.BasedFileSystem;
 import org.apache.jackrabbit.core.fs.FileSystem;
 import org.apache.jackrabbit.core.fs.FileSystemException;
@@ -1147,6 +1148,15 @@
                 log.error("failed to persist repository properties", e);
             }
         }
+        
+        if (dataStore != null) {
+            try {
+                // close the datastore
+                dataStore.close();
+            } catch (DataStoreException e) {
+                log.error("error while closing datastore", e);
+            }
+        }
 
         if (repStore != null) {
             try {