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

NIFI-7471 fix bug with property validation

This commit is contained in:
KovalevIV 2020-05-19 21:57:47 +03:00 committed by markap14
parent 441781cec5
commit 7034d7e44c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
View File

@ -197,6 +197,7 @@ public class StandardStateManagerProvider implements StateManagerProvider{
final ParameterParser parser = new ExpressionLanguageAwareParameterParser();
final Map<PropertyDescriptor, PropertyValue> propertyMap = new HashMap<>();
final Map<PropertyDescriptor, PropertyConfiguration> propertyStringMap = new HashMap<>();
//set default configuration
for (final PropertyDescriptor descriptor : provider.getPropertyDescriptors()) {
propertyMap.put(descriptor, new StandardPropertyValue(descriptor.getDefaultValue(),null, parameterLookup, variableRegistry));
@ -205,12 +206,12 @@ public class StandardStateManagerProvider implements StateManagerProvider{
propertyStringMap.put(descriptor, configuration);
}
//set properties from actual configuration
for (final Map.Entry<String, String> entry : providerConfig.getProperties().entrySet()) {
final PropertyDescriptor descriptor = provider.getPropertyDescriptor(entry.getKey());
final ParameterTokenList references = parser.parseTokens(descriptor.getDefaultValue());
final PropertyConfiguration configuration = new PropertyConfiguration(descriptor.getDefaultValue(), references, references.toReferenceList());
final ParameterTokenList references = parser.parseTokens(entry.getValue());
final PropertyConfiguration configuration = new PropertyConfiguration(entry.getValue(), references, references.toReferenceList());
propertyStringMap.put(descriptor, configuration);
propertyMap.put(descriptor, new StandardPropertyValue(entry.getValue(),null, parameterLookup, variableRegistry));