Repository: nifi Updated Branches: refs/heads/master 317b2f4a4 -> 8a8ae5508
NIFI-1313 Allow deletion of ProcessGroups that contain nested ProcessGroups Signed-off-by: Matt Gilman <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8a8ae550 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8a8ae550 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8a8ae550 Branch: refs/heads/master Commit: 8a8ae5508f7146e89cd2386e0ef334948e447c27 Parents: 317b2f4 Author: Richard Miskin <[email protected]> Authored: Sat Dec 19 07:07:54 2015 +0000 Committer: Matt Gilman <[email protected]> Committed: Fri Jan 8 16:22:55 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/groups/StandardProcessGroup.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/8a8ae550/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java index 93acfa4..88fa43f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java @@ -1902,7 +1902,9 @@ public final class StandardProcessGroup implements ProcessGroup { } for (final ProcessGroup childGroup : processGroups.values()) { - childGroup.verifyCanDelete(); + // For nested child groups we can ignore the input/output port + // connections as they will be being deleted anyway. + childGroup.verifyCanDelete(true); } if (!ignoreConnections) {
