Repository: nifi
Updated Branches:
  refs/heads/master 6bb43bd47 -> 29e96ed0e


NIFI-5145: Fixed MockPropertyValue to call the correct 
evaluateAttributeExpressions when FF is null

Signed-off-by: Matthew Burgess <[email protected]>

This closes #2717


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

Branch: refs/heads/master
Commit: 29e96ed0e0b63bc2f5b0f07751fe7efbc10f18ab
Parents: 6bb43bd
Author: Matthew Burgess <[email protected]>
Authored: Thu May 17 20:48:36 2018 -0400
Committer: Matthew Burgess <[email protected]>
Committed: Thu May 17 21:33:46 2018 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/nifi/util/MockPropertyValue.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/29e96ed0/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 5f09e82..a5df1a9 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,7 +16,6 @@
  */
 package org.apache.nifi.util;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -210,7 +209,7 @@ public class MockPropertyValue implements PropertyValue {
          * raises an error which makes it not mimick real world behavior.
          */
         if (flowFile == null) {
-            return evaluateAttributeExpressions(new HashMap<>());
+            return evaluateAttributeExpressions(null, 
(Map<String,String>)null);
         }
         return evaluateAttributeExpressions(flowFile, null, null);
     }

Reply via email to