You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2019/08/06 14:20:01 UTC
[nifi] branch master updated: NIFI-6380: Fixed NPE that is thrown
when clustered and using parameters from Controller Services
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 164e0c4 NIFI-6380: Fixed NPE that is thrown when clustered and using parameters from Controller Services
164e0c4 is described below
commit 164e0c41867bb3a486f077dbd79e8c9d379120e8
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Mon Aug 5 14:17:16 2019 -0400
NIFI-6380: Fixed NPE that is thrown when clustered and using parameters from Controller Services
This closes #3635
---
.../coordination/http/endpoints/ParameterContextMerger.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ParameterContextMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ParameterContextMerger.java
index 7278b54..805aff7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ParameterContextMerger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ParameterContextMerger.java
@@ -142,7 +142,7 @@ public class ParameterContextMerger {
final AffectedComponentDTO mergedComponent = merged.getComponent();
final AffectedComponentDTO additionalComponent = additional.getComponent();
- mergedComponent.setActiveThreadCount(mergedComponent.getActiveThreadCount() + additionalComponent.getActiveThreadCount());
+ mergedComponent.setActiveThreadCount(add(mergedComponent.getActiveThreadCount(), additionalComponent.getActiveThreadCount()));
if (mergedComponent.getValidationErrors() == null) {
mergedComponent.setValidationErrors(new ArrayList<>());
@@ -152,4 +152,14 @@ public class ParameterContextMerger {
mergedComponent.getValidationErrors().addAll(additionalComponent.getValidationErrors());
}
}
+
+ private static Integer add(final Integer a, final Integer b) {
+ if (a == null) {
+ return b;
+ }
+ if (b == null) {
+ return a;
+ }
+ return a + b;
+ }
}