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 mr...@apache.org on 2018/05/29 08:45:48 UTC

svn commit: r1832433 - /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java

Author: mreutegg
Date: Tue May 29 08:45:47 2018
New Revision: 1832433

URL: http://svn.apache.org/viewvc?rev=1832433&view=rev
Log:
OAK-7516: DocumentMKBuilderProvider may try to dispose an uninitialised store

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java?rev=1832433&r1=1832432&r2=1832433&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java Tue May 29 08:45:47 2018
@@ -69,8 +69,14 @@ public class DocumentMKBuilderProvider e
         
         @Override
         public DocumentNodeStore getNodeStore() {
-            initialised = true;
-            return super.getNodeStore();
+            boolean success = false;
+            try {
+                DocumentNodeStore ns = super.getNodeStore();
+                success = true;
+                return ns;
+            } finally {
+                initialised = success;
+            }
         }
 
         public void dispose() {