Repository: nifi Updated Branches: refs/heads/master 8aaa51af3 -> 6bb43bd47
NIFI-5145 Changed the override in MockPropertyValue to use a better way of passing over null flowfiles in evaluateExpressionLanguage. Signed-off-by: Matthew Burgess <mattyb...@apache.org> This closes #2714 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6bb43bd4 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6bb43bd4 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6bb43bd4 Branch: refs/heads/master Commit: 6bb43bd4716dda44738d4754518cb60467b62ea6 Parents: 8aaa51a Author: Mike Thomsen <mikerthom...@gmail.com> Authored: Thu May 17 12:47:53 2018 -0400 Committer: Matthew Burgess <mattyb...@apache.org> Committed: Thu May 17 20:00:24 2018 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/util/MockPropertyValue.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/6bb43bd4/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java ---------------------------------------------------------------------- diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java index cdabc6b..5f09e82 100644 --- a/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java +++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java @@ -16,6 +16,7 @@ */ package org.apache.nifi.util; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -209,7 +210,7 @@ public class MockPropertyValue implements PropertyValue { * raises an error which makes it not mimick real world behavior. */ if (flowFile == null) { - return evaluateAttributeExpressions(); + return evaluateAttributeExpressions(new HashMap<>()); } return evaluateAttributeExpressions(flowFile, null, null); }
