NIFI-903: Check for null value before trying to close 'out' OutputStream on StandardRecordWriter.close
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f8c216b0 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f8c216b0 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f8c216b0 Branch: refs/heads/master Commit: f8c216b0617068995aa7a4575cd6298f0e59378d Parents: c68da68 Author: Mark Payne <[email protected]> Authored: Mon Aug 31 10:50:00 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Mon Aug 31 10:50:00 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/provenance/StandardRecordWriter.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f8c216b0/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java index a8c0dd0..b95d805 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordWriter.java @@ -274,8 +274,13 @@ public class StandardRecordWriter implements RecordWriter { lock(); try { try { - out.flush(); - out.close(); + if (out != null) { + try { + out.flush(); + } finally { + out.close(); + } + } } finally { rawOutStream.close();
