FileTransactionStoreManager#closeFile() method remove redundant fileC…

…hannel.close() invoke (apache#140)
lixin46 · Jan 17, 2019 · 72d238d · 72d238d
1 parent ed4eddb
commit 72d238d
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/server/src/main/java/com/alibaba/fescar/server/store/FileTransactionStoreManager.java b/server/src/main/java/com/alibaba/fescar/server/store/FileTransactionStoreManager.java
@@ -177,7 +177,7 @@ public boolean hasRemaining(boolean isHistory) {
 
         } catch (IOException exx) {
         } finally {
-            closeFile(raf, null);
+            closeFile(raf);
         }
         return false;
     }
@@ -228,7 +228,7 @@ private List<TransactionWriteStore> parseDataFile(File file, int readSize, long
                         recoverCurrOffset = fileChannel.position();
                     }
                 }
-                closeFile(raf, fileChannel);
+                closeFile(raf);
             } catch (IOException exx) {
                 LOGGER.error("file close error," + exx.getMessage());
             }
@@ -241,12 +241,8 @@ private boolean isHisFile(File file) {
         return file.getName().endsWith(HIS_DATA_FILENAME_POSTFIX);
     }
 
-    private void closeFile(RandomAccessFile raf, FileChannel fileChannel) {
+    private void closeFile(RandomAccessFile raf) {
         try {
-            if (null != fileChannel) {
-                fileChannel.close();
-                fileChannel = null;
-            }
             if (null != raf) {
                 raf.close();
                 raf = null;
@@ -353,7 +349,7 @@ private void saveHistory() throws IOException {
                     }
                 }
                 currFileChannel.force(true);
-                closeFile(currRaf, currFileChannel);
+                closeFile(currRaf);
                 Files.move(currDataFile.toPath(), new File(hisFullFileName).toPath(),
                     StandardCopyOption.REPLACE_EXISTING);
             } catch (IOException exx) {