svn commit: r1848562 - /jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java

[adulceanu]

Author: adulceanu
Date: Mon Dec 10 11:34:19 2018
New Revision: 1848562

URL: http://svn.apache.org/viewvc?rev=1848562&view=rev
Log:
OAK-7950 - oak-run check crashes with UncheckedExecutionException (caused by 
SNFE)

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

Modified: 
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java?rev=1848562&r1=1848561&r2=1848562&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
 Mon Dec 10 11:34:19 2018
@@ -30,6 +30,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
 import com.google.common.io.Closer;
+import com.google.common.util.concurrent.UncheckedExecutionException;
 import org.apache.jackrabbit.oak.segment.RecordId;
 import org.apache.jackrabbit.oak.segment.Segment;
 import org.apache.jackrabbit.oak.segment.SegmentId;
@@ -86,7 +87,7 @@ public class ReadOnlyFileStore extends A
 
     /**
      * Go to the specified {@code revision}
-     * 
+     *
      * @param revision
      */
     public void setRevision(String revision) {
@@ -116,7 +117,7 @@ public class ReadOnlyFileStore extends A
                     return readSegmentUncached(tarFiles, id);
                 }
             });
-        } catch (ExecutionException e) {
+        } catch (ExecutionException | UncheckedExecutionException e) {
             throw asSegmentNotFoundException(e, id);
         }
     }