NIFI-6949: When a Controller Service is removed, ensure that any othe…

…r 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 <pierre.villard.fr@gmail.com>

This closes #3933.

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 void removeControllerService(final ControllerServiceNode service) {
                 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);
                         }