Index: RepositoryImpl.java
===================================================================
--- RepositoryImpl.java	(revision 781857)
+++ RepositoryImpl.java	(working copy)
@@ -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,16 @@
                 log.error("failed to persist repository properties", e);
             }
         }
+        
+        if (dataStore != null) {
+            try {
+                // close datastore
+                dataStore.close();
+            }
+            catch (DataStoreException e) {
+                log.error("error while closing datastore", e);
+            }
+        }
 
         if (repStore != null) {
             try {