You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2022/04/11 23:26:55 UTC
[nifi] branch main updated: NIFI-9874: Consider Flow Difference Type of PARAMETER_CONTEXT_CHANGED an environmental change
This is an automated email from the ASF dual-hosted git repository.
mattyb149 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 0bd5f5f34e NIFI-9874: Consider Flow Difference Type of PARAMETER_CONTEXT_CHANGED an environmental change
0bd5f5f34e is described below
commit 0bd5f5f34e1a47af28f3ac7e8809e6bd62c6fe92
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Wed Apr 6 16:16:22 2022 -0400
NIFI-9874: Consider Flow Difference Type of PARAMETER_CONTEXT_CHANGED an environmental change
Signed-off-by: Matthew Burgess <ma...@apache.org>
This closes #5939
---
.../src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
index 05ec04319a..a170833985 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
@@ -69,7 +69,8 @@ public class FlowDifferenceFilters {
|| isPropertyMissingFromGhostComponent(difference, flowManager)
|| isNewRetryConfigWithDefaultValue(difference, flowManager)
|| isNewZIndexLabelConfigWithDefaultValue(difference, flowManager)
- || isNewZIndexConnectionConfigWithDefaultValue(difference, flowManager);
+ || isNewZIndexConnectionConfigWithDefaultValue(difference, flowManager)
+ || isParameterContextChange(difference);
}
/**
@@ -445,4 +446,8 @@ public class FlowDifferenceFilters {
return false;
}
+
+ private static boolean isParameterContextChange(final FlowDifference flowDifference) {
+ return flowDifference.getDifferenceType() == DifferenceType.PARAMETER_CONTEXT_CHANGED;
+ }
}