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 ch...@apache.org on 2017/07/11 11:13:13 UTC

svn commit: r1801591 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java

Author: chetanm
Date: Tue Jul 11 11:13:13 2017
New Revision: 1801591

URL: http://svn.apache.org/viewvc?rev=1801591&view=rev
Log:
OAK-6443 - NodeStoreFixtureProvider not closing DocumentNodeStore

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java?rev=1801591&r1=1801590&r2=1801591&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java Tue Jul 11 11:13:13 2017
@@ -35,6 +35,7 @@ import com.google.common.io.Closer;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.mongodb.MongoClientURI;
 import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
 import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
 import org.apache.jackrabbit.oak.plugins.metric.MetricStatisticsProvider;
@@ -140,7 +141,10 @@ public class NodeStoreFixtureProvider {
             builder.setRDBConnection(ds);
         }
 
-        return builder.getNodeStore();
+        DocumentNodeStore dns = builder.getNodeStore();
+        closer.register(() -> dns.dispose());
+
+        return dns;
     }
 
     private static NodeStore configureSegment(Options options, BlobStore blobStore, StatisticsProvider statisticsProvider, Closer closer, boolean readOnly)