You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/11/22 22:32:01 UTC

nifi git commit: NIFI-3084 Fixing TestPersistentProvenanceRepository and closing a stream leak in RecordReaders.

Repository: nifi
Updated Branches:
  refs/heads/master 913ae9161 -> 50667ed22


NIFI-3084 Fixing TestPersistentProvenanceRepository and closing a stream leak in RecordReaders.

This closes #1260.


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/50667ed2
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/50667ed2
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/50667ed2

Branch: refs/heads/master
Commit: 50667ed2225fe3f5b1461f1a48db32d5f637009a
Parents: 913ae91
Author: Joseph Percivall <jo...@yahoo.com>
Authored: Tue Nov 22 17:11:13 2016 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Nov 22 17:31:47 2016 -0500

----------------------------------------------------------------------
 .../org/apache/nifi/provenance/serialization/RecordReaders.java    | 1 +
 .../apache/nifi/provenance/TestPersistentProvenanceRepository.java | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/50667ed2/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java
index 24efcbd..526a488 100644
--- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java
+++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/serialization/RecordReaders.java
@@ -118,6 +118,7 @@ public class RecordReaders {
                 serializationName = dis.readUTF();
                 bufferedInStream.reset();
             } catch (final EOFException eof) {
+                fis.close();
                 return new EmptyRecordReader();
             }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/50667ed2/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
index dec2a7b..831584b 100644
--- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
+++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestPersistentProvenanceRepository.java
@@ -1585,6 +1585,8 @@ public class TestPersistentProvenanceRepository {
         builder.fromFlowFile(createFlowFile(15, 3000L, attributes));
         attributes.put("uuid", "00000000-0000-0000-0000-00000000000" + 15);
         repo.registerEvent(builder.build());
+
+        Thread.sleep(3000L);
     }