fix potential input resource leaks (LGTM)

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1859591 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alain Béarez 2019-05-21 00:13:47 +00:00
parent 093cbcfcca
commit 8784d6d6d7
4 changed files with 27 additions and 19 deletions
src
examples/src/org/apache/poi/hssf/usermodel/examples
java/org/apache/poi/poifs/dev
scratchpad/src/org/apache/poi

View File

@ -33,8 +33,11 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
public class EmbeddedObjects { public class EmbeddedObjects {
@SuppressWarnings("unused") @SuppressWarnings("unused")
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(args[0])); try (
try (HSSFWorkbook workbook = new HSSFWorkbook(fs)) { FileInputStream fis = new FileInputStream(args[0]);
POIFSFileSystem fs = new POIFSFileSystem(fis);
HSSFWorkbook workbook = new HSSFWorkbook(fs)
) {
for (HSSFObjectData obj : workbook.getAllEmbeddedObjects()) { for (HSSFObjectData obj : workbook.getAllEmbeddedObjects()) {
//the OLE2 Class Name of the object //the OLE2 Class Name of the object
String oleName = obj.getOLE2ClassName(); String oleName = obj.getOLE2ClassName();

View File

@ -68,9 +68,11 @@ public class POIFSLister {
} }
public static void viewFileOld(final String filename, boolean withSizes) throws IOException { public static void viewFileOld(final String filename, boolean withSizes) throws IOException {
POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filename)); try (FileInputStream fis = new FileInputStream(filename)) {
displayDirectory(fs.getRoot(), "", withSizes); POIFSFileSystem fs = new POIFSFileSystem(fis);
fs.close(); displayDirectory(fs.getRoot(), "", withSizes);
fs.close();
}
} }
public static void displayDirectory(DirectoryNode dir, String indent, boolean withSizes) { public static void displayDirectory(DirectoryNode dir, String indent, boolean withSizes) {

View File

@ -128,12 +128,14 @@ public final class VisioTextExtractor extends POIOLE2TextExtractor {
System.exit(1); System.exit(1);
} }
VisioTextExtractor extractor = try (FileInputStream fis = new FileInputStream(args[0])) {
new VisioTextExtractor(new FileInputStream(args[0])); VisioTextExtractor extractor =
new VisioTextExtractor(fis);
// Print not PrintLn as already has \n added to it // Print not PrintLn as already has \n added to it
System.out.print(extractor.getText()); System.out.print(extractor.getText());
extractor.close(); extractor.close();
}
} }
} }

View File

@ -53,12 +53,13 @@ public final class PLCDumper {
System.err.println(" PLCDumper <filename>"); System.err.println(" PLCDumper <filename>");
System.exit(1); System.exit(1);
} }
PLCDumper dump = new PLCDumper(
new FileInputStream(args[0])
);
System.out.println("Dumping " + args[0]); try (FileInputStream fis = new FileInputStream(args[0])) {
dump.dumpPLC(); PLCDumper dump = new PLCDumper(fis);
System.out.println("Dumping " + args[0]);
dump.dumpPLC();
}
} }
private void dumpPLC() { private void dumpPLC() {