svn commit: r1814425 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java

[mduerig]

Author: mduerig
Date: Mon Nov  6 16:20:23 2017
New Revision: 1814425

URL: http://svn.apache.org/viewvc?rev=1814425&view=rev
Log:
OAK-6886: OffRC always logs 0 for the number of compacted nodes in gc.log Use a 
single FileStore instance for running compaction and cleanup

Reverting changes from http://svn.apache.org/viewvc?rev=1813883&view=rev

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java?rev=1814425&r1=1814424&r2=1814425&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Compact.java
 Mon Nov  6 16:20:23 2017
@@ -134,8 +134,10 @@ public class Compact implements Runnable
     private void compact() throws IOException, 
InvalidFileStoreVersionException {
         try (FileStore store = newFileStore()) {
             store.compactFull();
+        }
 
-            System.out.println("    -> cleaning up");
+        System.out.println("    -> cleaning up");
+        try (FileStore store = newFileStore()) {
             store.cleanup();
             File journal = new File(path, "journal.log");
             String head;