Use null instead of empty string for resolved expressions
@@ -150,7 +150,14 @@ public class PropertyExpressionResolver {
boolean resolveExpression(@Nonnull final FeedMetadata metadata, @Nonnull final NifiProperty property) {
final ResolveResult variableResult = resolveVariables(property, metadata);
final ResolveResult staticConfigResult = (!variableResult.isFinal) ? resolveStaticConfigProperty(property) : new ResolveResult(false, false);
- return variableResult.isModified || staticConfigResult.isModified;
+ if (variableResult.isModified || staticConfigResult.isModified) {
+ if (StringUtils.isEmpty(property.getValue())) {
+ property.setValue(null);
+ }
+ return true;
+ } else {
+ return false;
+ }
}
public boolean containsVariablesPatterns(String str) {
