You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2017/07/11 16:05:14 UTC
nifi git commit: NIFI-3677 - ExtractMediaMetadata should close
TikaInputStream * Added finally block to close TikaInputStream.
Repository: nifi
Updated Branches:
refs/heads/master 58fc5f24b -> 325fe53fa
NIFI-3677 - ExtractMediaMetadata should close TikaInputStream
* Added finally block to close TikaInputStream.
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #1993.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/325fe53f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/325fe53f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/325fe53f
Branch: refs/heads/master
Commit: 325fe53fa1bdb03b89a88a3c4c74a3623aaea6ec
Parents: 58fc5f2
Author: Joe Skora <js...@apache.org>
Authored: Fri Jul 7 17:38:28 2017 +0000
Committer: Pierre Villard <pi...@gmail.com>
Committed: Tue Jul 11 18:04:50 2017 +0200
----------------------------------------------------------------------
.../org/apache/nifi/processors/media/ExtractMediaMetadata.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/325fe53f/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java
index ab7e6ed..388bc73 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java
@@ -210,7 +210,11 @@ public class ExtractMediaMetadata extends AbstractProcessor {
Integer maxAttribLen) throws IOException, TikaException, SAXException {
final Metadata metadata = new Metadata();
final TikaInputStream tikaInputStream = TikaInputStream.get(sourceStream);
- autoDetectParser.parse(tikaInputStream, new DefaultHandler(), metadata);
+ try {
+ autoDetectParser.parse(tikaInputStream, new DefaultHandler(), metadata);
+ } finally {
+ tikaInputStream.close();
+ }
final Map<String, String> results = new HashMap<>();
final Pattern metadataKeyFilter = metadataKeyFilterRef.get();