(jackrabbit-oak) branch trunk updated: Revert "OAK-10559 : closing secondary to avoid test interference (#1232)"

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 423cbe888e Revert "OAK-10559 : closing secondary to avoid test 
interference (#1232)"
423cbe888e is described below

commit 423cbe888e9debec5856e4e916b9935f377866d4
Author: Julian Reschke <julian.resc...@gmx.de>
AuthorDate: Sat Nov 25 10:26:52 2023 +0100

    Revert "OAK-10559 : closing secondary to avoid test interference (#1232)"
    
    This reverts commit 41adb88c8513754c14d4787d45a87aea95763647.
---
 .../oak/plugins/document/VersionGarbageCollectorIT.java      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
index 3935c5d85a..f46d4cdd32 100644
--- 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
+++ 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
@@ -97,8 +97,6 @@ public class VersionGarbageCollectorIT {
 
     private DocumentNodeStore store;
 
-    private DocumentNodeStore secondary;
-
     private VersionGarbageCollector gc;
 
     private ExecutorService execService;
@@ -143,13 +141,6 @@ public class VersionGarbageCollectorIT {
         if (store != null) {
             store.dispose();
         }
-        if (secondary != null) {
-            try {
-                secondary.dispose();
-            } catch(Exception e) {
-                // ignore
-            }
-        }
         Revision.resetClockToDefault();
         execService.shutdown();
         execService.awaitTermination(1, MINUTES);
@@ -439,11 +430,10 @@ public class VersionGarbageCollectorIT {
     }
 
     private DocumentNodeStore createSecondary() {
-        secondary = new DocumentMK.Builder().clock(clock)
+        return new DocumentMK.Builder().clock(clock)
                 .setLeaseCheckMode(LeaseCheckMode.DISABLED)
                 .setDocumentStore(store.getDocumentStore()).setAsyncDelay(0)
                 .setClusterId(2).getNodeStore();
-        return secondary;
     }
 
     private void createLeaf(DocumentNodeStore s, String... pathElems) throws 
Exception {