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 2019/09/24 19:44:06 UTC

svn commit: r1867491 - /jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java

Author: mreutegg
Date: Tue Sep 24 19:44:06 2019
New Revision: 1867491

URL: http://svn.apache.org/viewvc?rev=1867491&view=rev
Log:
OAK-8627: Avoid late-arriving lastRev update from crashed instance

DocumentNodeStore must be disposed before collection is dropped
Make call to dispose fail-safe in test tear down

Modified:
    jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java

Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java?rev=1867491&r1=1867490&r2=1867491&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java Tue Sep 24 19:44:06 2019
@@ -682,8 +682,13 @@ public class DataStoreCommandTest {
             }
 
             @Override public void after() {
-                MongoUtils.dropCollections(c.getDBName());
-                nodeStore.dispose();
+                String dbName = c.getDBName();
+                try {
+                    nodeStore.dispose();
+                } catch (Exception e) {
+                    log.warn("dispose failed with exception", e);
+                }
+                MongoUtils.dropCollections(dbName);
             }
         }