You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by js...@apache.org on 2016/04/19 17:21:42 UTC

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

Author: jsedding
Date: Tue Apr 19 15:21:42 2016
New Revision: 1739946

URL: http://svn.apache.org/viewvc?rev=1739946&view=rev
Log:
OAK-4241 - JdbcNodeStoreContainer does not correctly clean up H2 temp files

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=1739946&r1=1739945&r2=1739946&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 15:21:42 2016
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
 import com.google.common.io.Closer;
 
 import javax.sql.DataSource;
+import java.io.Closeable;
 
 public class JdbcFactory implements NodeStoreFactory {
 
@@ -62,6 +63,9 @@ 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;
     }