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 re...@apache.org on 2019/07/01 12:28:59 UTC

svn commit: r1862374 - /jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java

Author: reschke
Date: Mon Jul  1 12:28:59 2019
New Revision: 1862374

URL: http://svn.apache.org/viewvc?rev=1862374&view=rev
Log:
OAK-8446: Enable datastore consistency check after completion of garbage collection

close FileReader when done

Modified:
    jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java

Modified: jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java?rev=1862374&r1=1862373&r2=1862374&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java (original)
+++ jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java Mon Jul  1 12:28:59 2019
@@ -1068,9 +1068,10 @@ public class MarkSweepGarbageCollector i
                 LOG.warn("Consistency check found [{}] missing blobs", candidates);
 
                 if (candidates > 0) {
-                    LineIterator lineIterator = new LineIterator(new FileReader(consistencyCandidatesAfterGC));
-                    while(lineIterator.hasNext()) {
-                        LOG.warn("Missing Blob [{}]", lineIterator.nextLine());
+                    try (LineIterator lineIterator = new LineIterator(new FileReader(consistencyCandidatesAfterGC))) {
+                        while (lineIterator.hasNext()) {
+                            LOG.warn("Missing Blob [{}]", lineIterator.nextLine());
+                        }
                     }
                     LOG.warn(
                         "Consistency check failure in the the blob store after GC : {}", blobStore);