Repository: nifi Updated Branches: refs/heads/master 64cd34016 -> dbef69040
NIFI-5066: - Fixing predicate for finding all processors/ports that can be disabled. This closes #2739. 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/dbef6904 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/dbef6904 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/dbef6904 Branch: refs/heads/master Commit: dbef69040fe18ad9408937c78eb469ec5872eddc Parents: 18ec386 Author: Matt Gilman <[email protected]> Authored: Fri May 25 08:08:50 2018 -0400 Committer: Mark Payne <[email protected]> Committed: Fri May 25 11:22:21 2018 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/nifi/groups/ProcessGroup.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/dbef6904/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java index c266c64..e9c4d87 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java @@ -75,7 +75,7 @@ public interface ProcessGroup extends ComponentAuthorizable, Positionable, Versi /** * Predicate for disabling eligible Processors. */ - Predicate<ProcessorNode> DISABLE_PROCESSORS_FILTER = node -> !node.isRunning(); + Predicate<ProcessorNode> DISABLE_PROCESSORS_FILTER = node -> !node.isRunning() && !ScheduledState.DISABLED.equals(node.getScheduledState()); /** * Predicate for starting eligible Ports. @@ -95,7 +95,7 @@ public interface ProcessGroup extends ComponentAuthorizable, Positionable, Versi /** * Predicate for disabling eligible Ports. */ - Predicate<Port> DISABLE_PORTS_FILTER = port -> !port.isRunning(); + Predicate<Port> DISABLE_PORTS_FILTER = port -> !port.isRunning() && !ScheduledState.DISABLED.equals(port.getScheduledState()); /** * @return a reference to this ProcessGroup's parent. This will be
