From c9eb237895a94a27fc6f760b82b16ac3e2cdab95 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Thu, 19 Mar 2015 11:40:01 -0400 Subject: [PATCH] NIFI-443: Removed stopFunnel from ProcessGroup because we don't want to allow it --- .../src/main/java/org/apache/nifi/groups/ProcessGroup.java | 6 ------ .../java/org/apache/nifi/groups/StandardProcessGroup.java | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java index 53b26e1787..b898638bf6 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java @@ -192,12 +192,6 @@ public interface ProcessGroup { */ void stopOutputPort(Port port); - /** - * Stops the given Funnel - * - * @param processor - */ - void stopFunnel(Funnel funnel); /** * Disables the given Processor diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java index 0025caa550..3cd5853265 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java @@ -1108,8 +1108,7 @@ public final class StandardProcessGroup implements ProcessGroup { } } - @Override - public void stopFunnel(final Funnel funnel) { + private void stopFunnel(final Funnel funnel) { readLock.lock(); try { if (!funnels.containsKey(funnel.getIdentifier())) {