Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-5145 Fixed evaluateAttributeExpressions in mockpropertyvalue to make it handle null flowfiles. 

Signed-off-by: Matthew Burgess <mattyb149@apache.org>

This closes #2749
This commit is contained in:
Mike Thomsen 2018-05-31 19:39:05 -04:00 committed by Matthew Burgess
parent e5322b5d33
commit 2fb213d26c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nifi-mock/src/main/java/org/apache/nifi/util/MockPropertyValue.java
View File

@ -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;
@ -208,9 +209,13 @@ public class MockPropertyValue implements PropertyValue {
* is running, it doesn't care when it's evaluating EL against a null flowfile. However, the testing framework currently
* raises an error which makes it not mimick real world behavior.
*/
if (flowFile == null) {
return evaluateAttributeExpressions(null, (Map<String,String>)null);
if (flowFile == null && expressionLanguageScope == ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) {
return evaluateAttributeExpressions(new HashMap<>());
} else if (flowFile == null && expressionLanguageScope == ExpressionLanguageScope.VARIABLE_REGISTRY) {
return evaluateAttributeExpressions(); //Added this to get around a similar edge case where the a null flowfile is passed
//and the scope is to the registry
}
return evaluateAttributeExpressions(flowFile, null, null);
}