[nifi] branch master updated: 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

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 2277d08  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
2277d08 is described below

commit 2277d08c8ec20101797a0642b629133d136bdfb1
Author: Mark Payne <marka...@hotmail.com>
AuthorDate: Fri Dec 13 11:37:42 2019 -0500

    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 <pierre.villard...@gmail.com>
    
    This closes #3933.
---
 .../src/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 481c8f4..97064cf 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);
                         }