Repository: nifi Updated Branches: refs/heads/master 8392b4659 -> 2f5f7b830
NIFI-1429: - Only attempting to verify disabling of a referenced controller service when it's active. Signed-off-by: Mark Payne <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2f5f7b83 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2f5f7b83 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2f5f7b83 Branch: refs/heads/master Commit: 2f5f7b83028b6ba6920a81442880b1c30178c648 Parents: 8392b46 Author: Matt Gilman <[email protected]> Authored: Fri Jan 22 15:59:27 2016 -0500 Committer: Mark Payne <[email protected]> Committed: Fri Jan 22 16:22:40 2016 -0500 ---------------------------------------------------------------------- .../service/StandardControllerServiceProvider.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2f5f7b83/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java index 6561eb8..e31cfeb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java @@ -207,7 +207,9 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi final Set<ControllerServiceNode> serviceSet = new HashSet<>(toDisable); for (final ControllerServiceNode nodeToDisable : toDisable) { - nodeToDisable.verifyCanDisable(serviceSet); + if (nodeToDisable.isActive()) { + nodeToDisable.verifyCanDisable(serviceSet); + } } Collections.reverse(toDisable); @@ -593,7 +595,9 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi final Set<ControllerServiceNode> serviceSet = new HashSet<>(toDisable); for (final ControllerServiceNode nodeToDisable : toDisable) { - nodeToDisable.verifyCanDisable(serviceSet); + if (nodeToDisable.isActive()) { + nodeToDisable.verifyCanDisable(serviceSet); + } } }
