Author: abearez Date: Tue May 21 00:13:47 2019 New Revision: 1859591 URL: http://svn.apache.org/viewvc?rev=1859591&view=rev Log: fix potential input resource leaks (LGTM)
Modified: poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmbeddedObjects.java poi/trunk/src/java/org/apache/poi/poifs/dev/POIFSLister.java poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java Modified: poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmbeddedObjects.java URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmbeddedObjects.java?rev=1859591&r1=1859590&r2=1859591&view=diff ============================================================================== --- poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmbeddedObjects.java (original) +++ poi/trunk/src/examples/src/org/apache/poi/hssf/usermodel/examples/EmbeddedObjects.java Tue May 21 00:13:47 2019 @@ -33,8 +33,11 @@ import org.apache.poi.poifs.filesystem.P public class EmbeddedObjects { @SuppressWarnings("unused") public static void main(String[] args) throws Exception { - POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(args[0])); - try (HSSFWorkbook workbook = new HSSFWorkbook(fs)) { + try ( + FileInputStream fis = new FileInputStream(args[0]); + POIFSFileSystem fs = new POIFSFileSystem(fis); + HSSFWorkbook workbook = new HSSFWorkbook(fs) + ) { for (HSSFObjectData obj : workbook.getAllEmbeddedObjects()) { //the OLE2 Class Name of the object String oleName = obj.getOLE2ClassName(); Modified: poi/trunk/src/java/org/apache/poi/poifs/dev/POIFSLister.java URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/dev/POIFSLister.java?rev=1859591&r1=1859590&r2=1859591&view=diff ============================================================================== --- poi/trunk/src/java/org/apache/poi/poifs/dev/POIFSLister.java (original) +++ poi/trunk/src/java/org/apache/poi/poifs/dev/POIFSLister.java Tue May 21 00:13:47 2019 @@ -68,9 +68,11 @@ public class POIFSLister { } public static void viewFileOld(final String filename, boolean withSizes) throws IOException { - POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filename)); - displayDirectory(fs.getRoot(), "", withSizes); - fs.close(); + try (FileInputStream fis = new FileInputStream(filename)) { + POIFSFileSystem fs = new POIFSFileSystem(fis); + displayDirectory(fs.getRoot(), "", withSizes); + fs.close(); + } } public static void displayDirectory(DirectoryNode dir, String indent, boolean withSizes) { @@ -92,7 +94,7 @@ public class POIFSLister { name = name.substring(1) + " <" + altname + ">"; } if (withSizes) { - size = " [" + doc.getSize() + " / 0x" + + size = " [" + doc.getSize() + " / 0x" + Integer.toHexString(doc.getSize()) + "]"; } System.out.println(newIndent + name + size); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java?rev=1859591&r1=1859590&r2=1859591&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java Tue May 21 00:13:47 2019 @@ -60,7 +60,7 @@ public final class VisioTextExtractor ex /** * Locates all the text entries in the file, and returns their * contents. - * + * * @return An array of each Text item in the document */ public String[] getAllText() { @@ -106,7 +106,7 @@ public final class VisioTextExtractor ex * Returns the textual contents of the file. * Each textual object's text will be separated * by a newline - * + * * @return All text contained in this document, separated by <code>\n</code> */ @Override @@ -128,12 +128,14 @@ public final class VisioTextExtractor ex System.exit(1); } - VisioTextExtractor extractor = - new VisioTextExtractor(new FileInputStream(args[0])); + try (FileInputStream fis = new FileInputStream(args[0])) { + VisioTextExtractor extractor = + new VisioTextExtractor(fis); - // Print not PrintLn as already has \n added to it - System.out.print(extractor.getText()); - - extractor.close(); + // Print not PrintLn as already has \n added to it + System.out.print(extractor.getText()); + + extractor.close(); + } } } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java?rev=1859591&r1=1859590&r2=1859591&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java Tue May 21 00:13:47 2019 @@ -53,12 +53,13 @@ public final class PLCDumper { System.err.println(" PLCDumper <filename>"); System.exit(1); } - PLCDumper dump = new PLCDumper( - new FileInputStream(args[0]) - ); - System.out.println("Dumping " + args[0]); - dump.dumpPLC(); + try (FileInputStream fis = new FileInputStream(args[0])) { + PLCDumper dump = new PLCDumper(fis); + + System.out.println("Dumping " + args[0]); + dump.dumpPLC(); + } } private void dumpPLC() { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org