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 2015/04/22 18:44:12 UTC
incubator-nifi git commit: NIFI-535: Fixed NPE in SnippetUtils
Repository: incubator-nifi
Updated Branches:
refs/heads/develop c026dff40 -> 6fa596884
NIFI-535: Fixed NPE in SnippetUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6fa59688
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6fa59688
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6fa59688
Branch: refs/heads/develop
Commit: 6fa596884bcf47774ecb5d8b6a95b30b9c3e7c7b
Parents: c026dff
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Apr 22 12:18:41 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Apr 22 12:18:41 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/web/util/SnippetUtils.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6fa59688/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
index 40e5730..76789c6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
@@ -194,13 +194,21 @@ public final class SnippetUtils {
}
private void addControllerServicesToSnippet(final FlowSnippetDTO snippetDto) {
- for ( final ProcessorDTO processorDto : snippetDto.getProcessors() ) {
- addControllerServicesToSnippet(snippetDto, processorDto);
+ final Set<ProcessorDTO> processors = snippetDto.getProcessors();
+ if ( processors != null ) {
+ for ( final ProcessorDTO processorDto : processors ) {
+ addControllerServicesToSnippet(snippetDto, processorDto);
+ }
}
- for ( final ProcessGroupDTO processGroupDto : snippetDto.getProcessGroups() ) {
- final FlowSnippetDTO childGroupDto = processGroupDto.getContents();
- addControllerServicesToSnippet(childGroupDto);
+ final Set<ProcessGroupDTO> childGroups = snippetDto.getProcessGroups();
+ if ( childGroups != null ) {
+ for ( final ProcessGroupDTO processGroupDto : childGroups ) {
+ final FlowSnippetDTO childGroupDto = processGroupDto.getContents();
+ if ( childGroupDto != null ) {
+ addControllerServicesToSnippet(childGroupDto);
+ }
+ }
}
}