You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2018/07/12 01:55:58 UTC

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

Repository: nifi
Updated Branches:
  refs/heads/support/nifi-1.7.x b46033be3 -> 4f75a0b46


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/4f75a0b4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4f75a0b4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4f75a0b4

Branch: refs/heads/support/nifi-1.7.x
Commit: 4f75a0b46cd98ad7642ad0cde98e0504881b7751
Parents: b46033b
Author: Mark Bean <ma...@gmail.com>
Authored: Fri Jul 6 12:29:00 2018 +0000
Committer: Andy LoPresto <al...@apache.org>
Committed: Wed Jul 11 18:55:45 2018 -0700

----------------------------------------------------------------------
 .../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/4f75a0b4/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 d5b6f80..700185c 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
@@ -2271,9 +2271,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);
             }
         }
     }