From 2277d08c8ec20101797a0642b629133d136bdfb1 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Fri, 13 Dec 2019 11:37:42 -0500 Subject: [PATCH] NIFI-6949: When a Controller Service is removed, ensure that any other service that it references is obtained via the ControllerServiceProvider to ensure that it is obtain to obtain and remove the reference, even if the service is in a higher-level Process Group Signed-off-by: Pierre Villard This closes #3933. --- .../main/java/org/apache/nifi/groups/StandardProcessGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 481c8f4411..97064cf840 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 @@ -2177,7 +2177,7 @@ public final class StandardProcessGroup implements ProcessGroup { if (descriptor.getControllerServiceDefinition() != null) { final String value = entry.getValue() == null ? descriptor.getDefaultValue() : entry.getValue(); if (value != null) { - final ControllerServiceNode referencedNode = getControllerService(value); + final ControllerServiceNode referencedNode = controllerServiceProvider.getControllerServiceNode(value); if (referencedNode != null) { referencedNode.removeReference(service, descriptor); }