You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2018/07/10 13:57:41 UTC

[2/2] nifi git commit: NIFI-5377 prevent infinite loop if a controller service circular reference exists

NIFI-5377 prevent infinite loop if a controller service circular reference exists


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0d07bc49
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0d07bc49
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0d07bc49

Branch: refs/heads/master
Commit: 0d07bc495118889aaf28a8d4bcb7e32796c99b99
Parents: 3ef8b4a
Author: Mark Bean <ma...@gmail.com>
Authored: Fri Jul 6 12:29:00 2018 +0000
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Jul 10 09:57:13 2018 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/0d07bc49/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index a781442..1c96861 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -2282,9 +2282,9 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
             if (component instanceof ControllerServiceNode) {
                 final ControllerServiceNode node = (ControllerServiceNode) component;
                 if (!visited.contains(node)) {
+                    visited.add(node);
                     findControllerServiceReferencingComponentIdentifiers(node.getReferences(), visited);
                 }
-                visited.add(node);
             }
         }
     }