From e9121036ccfb6d93ac716d6bc1408235eb29133a Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Wed, 4 Apr 2018 19:41:10 +0000
Subject: [PATCH] Bug 62165: Do not close stream when opening succeeds

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1828377 13f79535-47bb-0310-9956-ffa450edef68
---
 .../poi/hssf/extractor/OldExcelExtractor.java |  8 ++-
 .../hssf/extractor/TestOldExcelExtractor.java | 53 +++++++++----------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java b/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
index 619984fdc..0d2abb1f2 100644
--- a/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
+++ b/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
@@ -114,8 +114,14 @@ public class OldExcelExtractor implements Closeable {
             : new BufferedInputStream(biffStream, 8);
 
         if (FileMagic.valueOf(bis) == FileMagic.OLE2) {
-            try (NPOIFSFileSystem poifs = new NPOIFSFileSystem(bis)) {
+            NPOIFSFileSystem poifs = new NPOIFSFileSystem(bis);
+            try {
                 open(poifs);
+                toClose = poifs; // Fixed by GR, we should not close it here
+            } finally {
+                if (toClose == null) {
+                    poifs.close();
+                }
             }
         } else {
             ris = new RecordInputStream(bis);
diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java b/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
index a07470d72..b29b219d3 100644
--- a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
+++ b/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
@@ -218,6 +218,22 @@ public final class TestOldExcelExtractor {
         }
     }
 
+    @Test
+    public void testFromInputStream() throws IOException {
+        for (String ver : new String[] {"4", "5", "95"}) {
+            String filename = "testEXCEL_"+ver+".xls";
+            File f = HSSFTestDataSamples.getSampleFile(filename);
+
+            try (InputStream stream = new FileInputStream(f)) {
+                OldExcelExtractor extractor = new OldExcelExtractor(stream);
+                String text = extractor.getText();
+                assertNotNull(text);
+                assertTrue(text.length() > 100);
+                extractor.close();
+            }
+        }
+    }
+
     @Test(expected=OfficeXmlFileException.class)
     public void testOpenInvalidFile1() throws IOException {
         // a file that exists, but is a different format
@@ -234,11 +250,8 @@ public final class TestOldExcelExtractor {
     @Test(expected=FileNotFoundException.class)
     public void testOpenInvalidFile3() throws IOException {
         // a POIFS file which is not a Workbook
-        InputStream is = POIDataSamples.getDocumentInstance().openResourceAsStream("47304.doc");
-        try {
+        try (InputStream is = POIDataSamples.getDocumentInstance().openResourceAsStream("47304.doc")) {
             new OldExcelExtractor(is).close();
-        } finally {
-            is.close();
         }
     }
 
@@ -252,65 +265,50 @@ public final class TestOldExcelExtractor {
     @Test
     public void testInputStream() throws IOException {
         File file = HSSFTestDataSamples.getSampleFile("testEXCEL_3.xls");
-        InputStream stream = new FileInputStream(file);
-        try {
+        try (InputStream stream = new FileInputStream(file)) {
             OldExcelExtractor extractor = new OldExcelExtractor(stream);
             String text = extractor.getText();
             assertNotNull(text);
             extractor.close();
-        } finally {
-            stream.close();
         }
     }
 
     @Test
     public void testInputStreamNPOIHeader() throws IOException {
         File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
-        InputStream stream = new FileInputStream(file);
-        try {
+        try (InputStream stream = new FileInputStream(file)) {
             OldExcelExtractor extractor = new OldExcelExtractor(stream);
             extractor.close();
-        } finally {
-            stream.close();
         }
     }
 
     @Test
     public void testNPOIFSFileSystem() throws IOException {
         File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(file);
-        try {
+        try (NPOIFSFileSystem fs = new NPOIFSFileSystem(file)) {
             OldExcelExtractor extractor = new OldExcelExtractor(fs);
             extractor.close();
-        } finally {
-            fs.close();
         }
     }
 
     @Test
     public void testDirectoryNode() throws IOException {
         File file = HSSFTestDataSamples.getSampleFile("FormulaRefs.xls");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(file);
-        try {
+        try (NPOIFSFileSystem fs = new NPOIFSFileSystem(file)) {
             OldExcelExtractor extractor = new OldExcelExtractor(fs.getRoot());
             extractor.close();
-        } finally {
-            fs.close();
         }
     }
 
     @Test
     public void testDirectoryNodeInvalidFile() throws IOException {
         File file = POIDataSamples.getDocumentInstance().getFile("test.doc");
-        NPOIFSFileSystem fs = new NPOIFSFileSystem(file);
-        try {
+        try (NPOIFSFileSystem fs = new NPOIFSFileSystem(file)) {
             OldExcelExtractor extractor = new OldExcelExtractor(fs.getRoot());
             extractor.close();
             fail("Should catch exception here");
         } catch (FileNotFoundException e) {
             // expected here
-        } finally {
-            fs.close();
         }
     }
 
@@ -319,13 +317,10 @@ public final class TestOldExcelExtractor {
     public void testMainUsage() throws IOException {
         PrintStream save = System.err;
         try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            try {
+            try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
                 PrintStream str = new PrintStream(out, false, "UTF-8");
                 System.setErr(str);
-                OldExcelExtractor.main(new String[] {});
-            } finally {
-                out.close();
+                OldExcelExtractor.main(new String[]{});
             }
         } finally {
             System.setErr(save);