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 2015/09/08 16:56:52 UTC

svn commit: r1701814 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Author: mreutegg
Date: Tue Sep  8 14:56:52 2015
New Revision: 1701814

URL: http://svn.apache.org/r1701814
Log:
OAK-3376: DocumentNodeStoreTest.dispose() waiting indefinitely on ArrayBlockingQueue.put()

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1701814&r1=1701813&r2=1701814&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Tue Sep  8 14:56:52 2015
@@ -1785,6 +1785,8 @@ public class DocumentNodeStoreTest {
         while (t.isAlive()) {
             updates.poll(10, TimeUnit.MILLISECONDS);
         }
+        updates.clear();
+        throttleUpdates.set(false);
 
         // start new store with clusterId 2
         DocumentNodeStore store2 = builderProvider.newBuilder()
@@ -1806,7 +1808,6 @@ public class DocumentNodeStoreTest {
             node.child("child-2");
             merge(store2, builder);
         }
-        throttleUpdates.set(false);
     }
 
     // OAK-2695