Fixes #96 - Removed autoclose of FileChannel.

dain · Jun 26, 2019 · 8a89086 · 8a89086
1 parent 7994065
commit 8a89086
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/leveldb/src/main/java/org/iq80/leveldb/impl/TableCache.java b/leveldb/src/main/java/org/iq80/leveldb/impl/TableCache.java
@@ -26,6 +26,7 @@
 import org.iq80.leveldb.table.MMapTable;
 import org.iq80.leveldb.table.Table;
 import org.iq80.leveldb.table.UserComparator;
+import org.iq80.leveldb.util.Closeables;
 import org.iq80.leveldb.util.Finalizer;
 import org.iq80.leveldb.util.InternalTableIterator;
 import org.iq80.leveldb.util.Slice;
@@ -120,15 +121,21 @@ private TableAndFile(File databaseDir, long fileNumber, UserComparator userCompa
         {
             String tableFileName = Filename.tableFileName(fileNumber);
             File tableFile = new File(databaseDir, tableFileName);
-            try (FileInputStream fis = new FileInputStream(tableFile);
-                    FileChannel fileChannel = fis.getChannel()) {
+            FileInputStream fis = null;
+            try {
+                fis = new FileInputStream(tableFile);
+                FileChannel fileChannel = fis.getChannel();
                 if (Iq80DBFactory.USE_MMAP) {
                     table = new MMapTable(tableFile.getAbsolutePath(), fileChannel, userComparator, verifyChecksums);
                 }
                 else {
                     table = new FileChannelTable(tableFile.getAbsolutePath(), fileChannel, userComparator, verifyChecksums);
                 }
             }
+            catch (IOException ioe) {
+              Closeables.closeQuietly(fis);
+              throw ioe;
+            }
         }
 
         public Table getTable()