commit 3114bdb70121b444208a39959c6567a378a775e6
author Mark Payne <markap14@hotmail.com> Wed Oct 27 14:42:18 2021 -0400
committer Matthew Burgess <mattyb149@apache.org> Wed Oct 27 17:08:06 2021 -0400
tree ab60ce40d6fc47179279c963d06db493c71a0c3d
parent 059f14fd62508cd44e2c724f81256d37f90aa2e2

NIFI-9311: When determining property values, be sure to fetch the property descriptor from the component itself, rather than using the PropertyDescriptor in the Map. This allows us to ensure that if the definition of the PropertyDescriptor changes, the most up-to-date definition is picked up

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

This closes #5488

nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
index f4977cc..554d18d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
@@ -559,7 +559,7 @@
                 }
             }
 
-            properties.forEach((descriptor, config) -> props.put(descriptor, valueFunction.apply(descriptor, config)));
+            properties.forEach((descriptor, config) -> props.put(getPropertyDescriptor(descriptor.getName()), valueFunction.apply(descriptor, config)));
             return props;
         }
     }