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 2021/12/13 18:43:10 UTC
[nifi] 06/22: NIFI-9416: Fixing NPE when updating param context without inheritedParameterContexts
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 40621e3f5dda386ce7320c2fd34ef374a0270655
Author: Joe Gresock <jg...@gmail.com>
AuthorDate: Sat Nov 27 06:58:10 2021 -0500
NIFI-9416: Fixing NPE when updating param context without inheritedParameterContexts
---
.../org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java
index d4a69ac..ea7efb6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterContextDAO.java
@@ -232,9 +232,11 @@ public class StandardParameterContextDAO implements ParameterContextDAO {
resolveInheritedParameterContexts(parameterContextDto);
final List<ParameterContext> inheritedParameterContexts = new ArrayList<>();
- inheritedParameterContexts.addAll(parameterContextDto.getInheritedParameterContexts().stream()
- .map(entity -> flowManager.getParameterContextManager().getParameterContext(entity.getComponent().getId()))
- .collect(Collectors.toList()));
+ if (parameterContextDto.getInheritedParameterContexts() != null) {
+ inheritedParameterContexts.addAll(parameterContextDto.getInheritedParameterContexts().stream()
+ .map(entity -> flowManager.getParameterContextManager().getParameterContext(entity.getComponent().getId()))
+ .collect(Collectors.toList()));
+ }
return inheritedParameterContexts;
}