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 al...@apache.org on 2014/12/16 16:14:18 UTC

svn commit: r1645971 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java

Author: alexparvulescu
Date: Tue Dec 16 15:14:18 2014
New Revision: 1645971

URL: http://svn.apache.org/r1645971
Log:
OAK-2192 Concurrent commit during compaction results in mixed segments
 - wrapped the delete dir in a try/catch, as it sometimes fails on Win 

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java?rev=1645971&r1=1645970&r2=1645971&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java Tue Dec 16 15:14:18 2014
@@ -194,8 +194,12 @@ public class CompactionAndCleanupTest {
     }
 
     @After
-    public void cleanDir() throws IOException {
-        deleteDirectory(directory);
+    public void cleanDir() {
+        try {
+            deleteDirectory(directory);
+        } catch (IOException e) {
+            log.error("Error cleaning directory", e);
+        }
     }
 
     private static Blob createBlob(NodeStore nodeStore, int size) throws IOException {