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 md...@apache.org on 2018/09/11 11:19:48 UTC

svn commit: r1840540 - /jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java

Author: mduerig
Date: Tue Sep 11 11:19:48 2018
New Revision: 1840540

URL: http://svn.apache.org/viewvc?rev=1840540&view=rev
Log:
OAK-7708: Backport OAK-6648 to Oak 1.6
Merged r1808731

Modified:
    jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java

Modified: jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1840540&r1=1840539&r2=1840540&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Tue Sep 11 11:19:48 2018
@@ -493,8 +493,8 @@ public class FileStore extends AbstractF
         closeAndLogOnFail(closer);
 
         // Try removing pending files in case the scheduler didn't have a chance to run yet
-        fileReaper.reap();
         System.gc(); // for any memory-mappings that are no longer used
+        fileReaper.reap();
 
         log.info("TarMK closed: {}", directory);
     }