svn commit: r1751871 - /jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java

[alexparvulescu]

Author: alexparvulescu
Date: Fri Jul  8 08:55:03 2016
New Revision: 1751871

URL: http://svn.apache.org/viewvc?rev=1751871&view=rev
Log:
OAK-4548 SegmentDataStoreBlobGCIT failures

Modified:
    
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java

Modified: 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java?rev=1751871&r1=1751870&r2=1751871&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
 Fri Jul  8 08:55:03 2016
@@ -302,7 +302,15 @@ public class SegmentTracker {
                 UUID uid = queue.remove();
                 SegmentId id = getSegmentId(uid.getMostSignificantBits(),
                         uid.getLeastSignificantBits());
-                Segment segment = id.getSegment();
+                Segment segment = null;
+                try {
+                    segment = id.getSegment();
+                } catch (SegmentNotFoundException ex) {
+                    // gc'ed
+                }
+                if (segment == null) {
+                    continue;
+                }
                 segment.collectBlobReferences(collector);
                 for (SegmentId refid : segment.getReferencedIds()) {
                     UUID rid = refid.asUUID();