Skip to content

Commit 2021e71

Browse files
committed
TIKA-4531: use jdk9 try-with-resources
1 parent 4ac0e54 commit 2021e71

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ protected void handleEmbeddedResource(TikaInputStream resource, Metadata embedde
118118
XHTMLContentHandler xhtml, boolean outputHtml)
119119
throws IOException, SAXException, TikaException {
120120

121-
try {
121+
try (resource) {
122122
if (filename != null) {
123123
embeddedMetadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, filename);
124124
}
@@ -136,8 +136,6 @@ protected void handleEmbeddedResource(TikaInputStream resource, Metadata embedde
136136
if (embeddedDocumentUtil.shouldParseEmbedded(embeddedMetadata)) {
137137
embeddedDocumentUtil.parseEmbedded(resource, xhtml, embeddedMetadata, outputHtml);
138138
}
139-
} finally {
140-
resource.close();
141139
}
142140
}
143141

tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/test/java/org/apache/tika/parser/microsoft/chm/TestChmExtraction.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,10 @@ public void testChmParser() throws Exception {
7373
}
7474

7575
private void testingChm(InputStream stream) throws IOException, SAXException, TikaException {
76-
try {
76+
try (stream) {
7777
BodyContentHandler handler = new BodyContentHandler(-1);
7878
parser.parse(stream, handler, new Metadata(), new ParseContext());
7979
assertTrue(!handler.toString().isEmpty());
80-
} finally {
81-
stream.close();
8280
}
8381
}
8482

0 commit comments

Comments
 (0)