Repository: nifi Updated Branches: refs/heads/0.x c7c4d5f71 -> 468b0fccc
NIFI-2344 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/468b0fcc Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/468b0fcc Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/468b0fcc Branch: refs/heads/0.x Commit: 468b0fccc0259e93d0f0ea10ad3eb028a3e6389f Parents: c7c4d5f Author: Oleg Zhurakousky <[email protected]> Authored: Sat Jul 23 11:03:41 2016 -0400 Committer: joewitt <[email protected]> Committed: Tue Jul 26 00:15:50 2016 -0400 ---------------------------------------------------------------------- .../nifi/controller/service/StandardControllerServiceNode.java | 2 +- .../service/TestStandardControllerServiceProvider.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/468b0fcc/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 7a416af..4aa9ab6 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 @@ -118,7 +118,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.serviceProvider.getControllerServiceNode(pEntry.getValue()); requiredServices.add(rNode); requiredServices.addAll(rNode.getRequiredControllerServices()); http://git-wip-us.apache.org/repos/asf/nifi/blob/468b0fcc/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 857252a..ccb69e5 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 @@ -376,20 +376,23 @@ 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); 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()); } /**
