Repository: nifi Updated Branches: refs/heads/develop 0a279ff53 -> 91f4dae06
NIFI-838: - Fixing bug when checking the state of a referencing component when attempting to disable a controller service. Only considering referencing components as RUNNING when the state is RUNNING or has active threads. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/91f4dae0 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/91f4dae0 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/91f4dae0 Branch: refs/heads/develop Commit: 91f4dae0605130ecaf38f4712937c6ebdfa59f0d Parents: 0a279ff Author: Matt Gilman <[email protected]> Authored: Wed Aug 12 13:33:47 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed Aug 12 13:33:47 2015 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-controller-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/91f4dae0/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js index a74a306..af8e78c 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js @@ -782,7 +782,7 @@ nf.ControllerService = (function () { var stillRunning = false; $.each(referencingComponents, function(_, referencingComponent) { if (referencingComponent.referenceType === 'Processor' || referencingComponent.referenceType === 'ReportingTask') { - if (referencingComponent.state !== 'STOPPED' || referencingComponent.activeThreadCount > 0) { + if (referencingComponent.state === 'RUNNING' || referencingComponent.activeThreadCount > 0) { stillRunning = true; }
