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 2018/08/27 14:52:17 UTC
nifi git commit: NIFI-5551: If session.get() returns null,
then return fron onTrigger instead of assuming that the FlowFile is
non-null
Repository: nifi
Updated Branches:
refs/heads/master 8c0705cb6 -> 6ceee2585
NIFI-5551: If session.get() returns null, then return fron onTrigger instead of assuming that the FlowFile is non-null
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #2964.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6ceee258
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6ceee258
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6ceee258
Branch: refs/heads/master
Commit: 6ceee2585998b105926484b871bc6a4d7913f609
Parents: 8c0705c
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Aug 24 09:55:15 2018 -0400
Committer: Pierre Villard <pi...@gmail.com>
Committed: Mon Aug 27 16:52:07 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/nifi/processors/standard/UpdateCounter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/6ceee258/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java
index 5115817..e8f3bcf 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java
@@ -100,6 +100,10 @@ public class UpdateCounter extends AbstractProcessor {
@Override
public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException {
FlowFile flowFile = session.get();
+ if (flowFile == null) {
+ return;
+ }
+
session.adjustCounter(context.getProperty(COUNTER_NAME).evaluateAttributeExpressions(flowFile).getValue(),
Long.parseLong(context.getProperty(DELTA).evaluateAttributeExpressions(flowFile).getValue()),
false