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 fr...@apache.org on 2016/05/31 14:39:59 UTC
svn commit: r1746284 -
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
Author: frm
Date: Tue May 31 14:39:59 2016
New Revision: 1746284
URL: http://svn.apache.org/viewvc?rev=1746284&view=rev
Log:
OAK-4246 - Remove unnecessary conversion from FileStore to Closeable
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java?rev=1746284&r1=1746283&r2=1746284&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java Tue May 31 14:39:59 2016
@@ -35,7 +35,6 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.segment.file.tooling.ConsistencyChecker.checkConsistency;
import static org.slf4j.LoggerFactory.getLogger;
-import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
@@ -123,7 +122,7 @@ final class SegmentTarUtils {
} else {
fs = openReadOnlyFileStore(source);
}
- closer.register(asCloseable(fs));
+ closer.register(fs);
NodeStore store = SegmentNodeStore.builder(fs).build();
FileStoreBackup.backup(store, target);
} catch (Throwable e) {
@@ -649,17 +648,6 @@ final class SegmentTarUtils {
.withMemoryMapping(TAR_STORAGE_MEMORY_MAPPED).build();
}
- private static Closeable asCloseable(final FileStore fs) {
- return new Closeable() {
-
- @Override
- public void close() throws IOException {
- fs.close();
- }
-
- };
- }
-
private static File checkFileStoreVersionOrFail(String path, boolean force) throws IOException {
File directory = new File(path);
if (!directory.exists()) {