You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2023/01/26 22:35:40 UTC
[nifi] branch main updated: NIFI-11105: This closes #6895. When mapping Parameter Context to VersionedParameterContext, don't bother mapping those that have already been mapped, as it is redundant
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new d9f35b8974 NIFI-11105: This closes #6895. When mapping Parameter Context to VersionedParameterContext, don't bother mapping those that have already been mapped, as it is redundant
d9f35b8974 is described below
commit d9f35b89741ff2cd13ad77b7a8f995c96bac36b7
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Thu Jan 26 16:35:04 2023 -0500
NIFI-11105: This closes #6895. When mapping Parameter Context to VersionedParameterContext, don't bother mapping those that have already been mapped, as it is redundant
Signed-off-by: Joe Witt <jo...@apache.org>
---
.../org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
index c04e94b6c2..ca5754c59e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java
@@ -879,6 +879,10 @@ public class NiFiRegistryFlowMapper {
private void mapParameterContext(final ParameterContext parameterContext, final Map<String, VersionedParameterContext> parameterContexts,
final Map<String, ParameterProviderReference> parameterProviderReferences) {
+ if (parameterContexts.containsKey(parameterContext.getName())) {
+ return;
+ }
+
// map this process group's parameter context and add to the collection
final Set<VersionedParameter> parameters = mapParameters(parameterContext);