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/29 15:24:13 UTC
[2/2] nifi git commit: NIFI-2388: Addressed a spot that assumes that
Process Group is always set on StandardControllerServiceNode
NIFI-2388: Addressed a spot that assumes that Process Group is always set on StandardControllerServiceNode
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/70d70732
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/70d70732
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/70d70732
Branch: refs/heads/master
Commit: 70d70732b510283e8b22c603ab7db72589102d1e
Parents: bc0b5fe
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Jul 29 10:57:33 2016 -0400
Committer: joewitt <jo...@apache.org>
Committed: Fri Jul 29 11:02:52 2016 -0400
----------------------------------------------------------------------
.../service/StandardControllerServiceNode.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/70d70732/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 7952d0f..0c1e6b3 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
@@ -168,12 +168,12 @@ public class StandardControllerServiceNode extends AbstractConfiguredComponent i
@Override
public List<ControllerServiceNode> getRequiredControllerServices() {
Set<ControllerServiceNode> requiredServices = new HashSet<>();
- for (Entry<PropertyDescriptor, String> pEntry : this.getProperties().entrySet()) {
- PropertyDescriptor descriptor = pEntry.getKey();
- if (descriptor.getControllerServiceDefinition() != null && pEntry.getValue() != null) {
- ControllerServiceNode rNode = this.processGroup.getControllerService(pEntry.getValue());
- requiredServices.add(rNode);
- requiredServices.addAll(rNode.getRequiredControllerServices());
+ for (Entry<PropertyDescriptor, String> entry : getProperties().entrySet()) {
+ PropertyDescriptor descriptor = entry.getKey();
+ if (descriptor.getControllerServiceDefinition() != null && entry.getValue() != null) {
+ ControllerServiceNode requiredNode = serviceProvider.getControllerServiceNode(entry.getValue());
+ requiredServices.add(requiredNode);
+ requiredServices.addAll(requiredNode.getRequiredControllerServices());
}
}
return new ArrayList<>(requiredServices);