svn commit: r1739955 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java

[reschke]

Author: reschke
Date: Tue Apr 19 16:05:55 2016
New Revision: 1739955

URL: http://svn.apache.org/viewvc?rev=1739955&view=rev
Log:
OAK-4241: JdbcNodeStoreContainer does not correctly clean up H2 temp files - 
change the order in which resources are closed

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java?rev=1739955&r1=1739954&r2=1739955&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/JdbcFactory.java
 Tue Apr 19 16:05:55 2016
@@ -54,6 +54,9 @@ public class JdbcFactory implements Node
     @Override
     public NodeStore create(BlobStore blobStore, Closer closer) {
         DataSource ds = RDBDataSourceFactory.forJdbcUrl(jdbcUri, user, 
password);
+        if (ds instanceof Closeable) {
+            closer.register((Closeable)ds);
+        }
         DocumentMK.Builder builder = MongoFactory.getBuilder(cacheSize);
         if (blobStore != null) {
             builder.setBlobStore(blobStore);
@@ -63,9 +66,6 @@ public class JdbcFactory implements Node
                 builder.isDisableBranches());
         DocumentNodeStore documentNodeStore = builder.getNodeStore();
         closer.register(MongoFactory.asCloseable(documentNodeStore));
-        if (ds instanceof Closeable) {
-            closer.register((Closeable)ds);
-        }
         return documentNodeStore;
     }