You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/12/02 22:24:19 UTC

nifi git commit: NIFI-1243 This closes #137. added null check for 'currentReadClaimStream' . . .before it is being closed

Repository: nifi
Updated Branches:
  refs/heads/master 6a8c2dba1 -> 663b7f256


NIFI-1243 This closes #137. added null check for 'currentReadClaimStream' . . .before it is being closed

Signed-off-by: joewitt <jo...@apache.org>


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

Branch: refs/heads/master
Commit: 663b7f2561424ee9a9ce7070d783f63854e698b2
Parents: 6a8c2db
Author: Oleg Zhurakousky <ol...@suitcase.io>
Authored: Wed Dec 2 16:13:46 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Wed Dec 2 16:23:48 2015 -0500

----------------------------------------------------------------------
 .../apache/nifi/controller/repository/StandardProcessSession.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/663b7f25/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 6ad65c1..22fee7f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -1806,7 +1806,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
                 reader.process(ffais);
 
                 // Allow processors to close the file after reading to avoid too many files open or do smart session stream management.
-                if(!allowSessionStreamManagement){
+                if (this.currentReadClaimStream != null && !allowSessionStreamManagement) {
                     currentReadClaimStream.close();
                     currentReadClaimStream = null;
                 }