You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2016/07/26 04:48:48 UTC
nifi git commit: NIFI-2344 This closes #711. fixed
StandardControllerServiceNode.getRequiredControllerServices
Repository: nifi
Updated Branches:
refs/heads/master 67876f707 -> 2ec43076f
NIFI-2344 This closes #711. fixed StandardControllerServiceNode.getRequiredControllerServices
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2ec43076
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2ec43076
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2ec43076
Branch: refs/heads/master
Commit: 2ec43076faa98723e638c7951ed2853785de52cb
Parents: 67876f7
Author: Oleg Zhurakousky <ol...@suitcase.io>
Authored: Sat Jul 23 11:03:41 2016 -0400
Committer: joewitt <jo...@apache.org>
Committed: Tue Jul 26 00:48:24 2016 -0400
----------------------------------------------------------------------
.../nifi/controller/service/StandardControllerServiceNode.java | 2 +-
.../service/TestStandardControllerServiceProvider.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/2ec43076/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
index 0c1979c..7952d0f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
@@ -170,7 +170,7 @@ public class StandardControllerServiceNode extends AbstractConfiguredComponent i
Set<ControllerServiceNode> requiredServices = new HashSet<>();
for (Entry<PropertyDescriptor, String> pEntry : this.getProperties().entrySet()) {
PropertyDescriptor descriptor = pEntry.getKey();
- if (descriptor.getControllerServiceDefinition() != null && descriptor.isRequired()) {
+ if (descriptor.getControllerServiceDefinition() != null && pEntry.getValue() != null) {
ControllerServiceNode rNode = this.processGroup.getControllerService(pEntry.getValue());
requiredServices.add(rNode);
requiredServices.addAll(rNode.getRequiredControllerServices());
http://git-wip-us.apache.org/repos/asf/nifi/blob/2ec43076/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/TestStandardControllerServiceProvider.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/TestStandardControllerServiceProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/TestStandardControllerServiceProvider.java
index 8cb5673..65a6380 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/TestStandardControllerServiceProvider.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/TestStandardControllerServiceProvider.java
@@ -403,26 +403,30 @@ public class TestStandardControllerServiceProvider {
ControllerServiceNode C = provider.createControllerService(ServiceA.class.getName(), "C", false);
ControllerServiceNode D = provider.createControllerService(ServiceB.class.getName(), "D", false);
ControllerServiceNode E = provider.createControllerService(ServiceA.class.getName(), "E", false);
+ ControllerServiceNode F = provider.createControllerService(ServiceB.class.getName(), "F", false);
procGroup.addControllerService(A);
procGroup.addControllerService(B);
procGroup.addControllerService(C);
procGroup.addControllerService(D);
procGroup.addControllerService(E);
+ procGroup.addControllerService(F);
A.setProperty(ServiceA.OTHER_SERVICE.getName(), "B");
B.setProperty(ServiceA.OTHER_SERVICE.getName(), "D");
C.setProperty(ServiceA.OTHER_SERVICE.getName(), "B");
C.setProperty(ServiceA.OTHER_SERVICE_2.getName(), "D");
E.setProperty(ServiceA.OTHER_SERVICE.getName(), "A");
+ E.setProperty(ServiceA.OTHER_SERVICE_2.getName(), "F");
- provider.enableControllerServices(Arrays.asList(new ControllerServiceNode[] { A, B, C, D, E }));
+ provider.enableControllerServices(Arrays.asList(new ControllerServiceNode[] { A, B, C, D, E, F }));
assertTrue(A.isActive());
assertTrue(B.isActive());
assertTrue(C.isActive());
assertTrue(D.isActive());
assertTrue(E.isActive());
+ assertTrue(F.isActive());
}
/**