修复文件流需要gc才能关闭的问题 #511

alibaba · Aug 29, 2019 · e58a683 · e58a683
1 parent 7628257
commit e58a683
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/com/alibaba/excel/analysis/ExcelAnalyserImpl.java b/src/main/java/com/alibaba/excel/analysis/ExcelAnalyserImpl.java
@@ -117,30 +117,30 @@ public void finish() {
             throw new ExcelAnalysisException("Can not close IO", e);
         }
         try {
-            if (analysisContext.readWorkbookHolder().getAutoCloseStream()
-                && readWorkbookHolder.getInputStream() != null) {
-                readWorkbookHolder.getInputStream().close();
+            if (readWorkbookHolder.getOpcPackage() != null) {
+                readWorkbookHolder.getOpcPackage().close();
             }
         } catch (Throwable e) {
             throw new ExcelAnalysisException("Can not close IO", e);
         }
         try {
-            if (readWorkbookHolder.getTempFile() != null) {
-                FileUtils.delete(readWorkbookHolder.getTempFile());
+            if (readWorkbookHolder.getPoifsFileSystem() != null) {
+                readWorkbookHolder.getPoifsFileSystem().close();
             }
         } catch (Throwable e) {
             throw new ExcelAnalysisException("Can not close IO", e);
         }
         try {
-            if (readWorkbookHolder.getOpcPackage() != null) {
-                readWorkbookHolder.getOpcPackage().close();
+            if (analysisContext.readWorkbookHolder().getAutoCloseStream()
+                && readWorkbookHolder.getInputStream() != null) {
+                readWorkbookHolder.getInputStream().close();
             }
         } catch (Throwable e) {
             throw new ExcelAnalysisException("Can not close IO", e);
         }
         try {
-            if (readWorkbookHolder.getPoifsFileSystem() != null) {
-                readWorkbookHolder.getPoifsFileSystem().close();
+            if (readWorkbookHolder.getTempFile() != null) {
+                FileUtils.delete(readWorkbookHolder.getTempFile());
             }
         } catch (Throwable e) {
             throw new ExcelAnalysisException("Can not close IO", e);