You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/03/19 16:49:17 UTC
[2/3] incubator-nifi git commit: NIFI-443: Removed stopFunnel from
ProcessGroup because we don't want to allow it
NIFI-443: Removed stopFunnel from ProcessGroup because we don't want to allow it
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c9eb2378
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c9eb2378
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c9eb2378
Branch: refs/heads/develop
Commit: c9eb237895a94a27fc6f760b82b16ac3e2cdab95
Parents: 8b911c5
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Mar 19 11:40:01 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Mar 19 11:40:01 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/nifi/groups/ProcessGroup.java | 6 ------
.../main/java/org/apache/nifi/groups/StandardProcessGroup.java | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c9eb2378/nifi/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/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 53b26e1..b898638 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
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c9eb2378/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
----------------------------------------------------------------------
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 0025caa..3cd5853 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())) {