Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-571: Removed checking List<List<ControllerServiceNode>> to see if it contains a ControllerServiceNode, as it would always return false; intent was to check all inner Lists, but it's really not necessary (a bit of an optimization) that just confuses things

This commit is contained in:
Mark Payne 2015-06-05 16:01:09 -04:00
parent 089897190c
commit facc4242bd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
View File

@ -357,7 +357,7 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
if (bulletinRepo != null) {
bulletinRepo.addBulletin(BulletinFactory.createBulletin(
"Controller Service", Severity.ERROR.name(), "Could not start " + serviceNode + " due to " + e));
"Controller Service", Severity.ERROR.name(), "Could not start " + serviceNode + " due to " + e));
}
}
}
@ -391,10 +391,6 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
final List<List<ControllerServiceNode>> orderedNodeLists = new ArrayList<>();
for (final ControllerServiceNode node : serviceNodeMap.values()) {
if (orderedNodeLists.contains(node)) {
continue; // this node is already in the list.
}
final List<ControllerServiceNode> branch = new ArrayList<>();
determineEnablingOrder(serviceNodeMap, node, branch, new HashSet<ControllerServiceNode>());
orderedNodeLists.add(branch);
@ -404,10 +400,10 @@ public class StandardControllerServiceProvider implements ControllerServiceProvi
}
private static void determineEnablingOrder(
final Map<String, ControllerServiceNode> serviceNodeMap,
final ControllerServiceNode contextNode,
final List<ControllerServiceNode> orderedNodes,
final Set<ControllerServiceNode> visited) {
final Map<String, ControllerServiceNode> serviceNodeMap,
final ControllerServiceNode contextNode,
final List<ControllerServiceNode> orderedNodes,
final Set<ControllerServiceNode> visited) {
if (visited.contains(contextNode)) {
return;
}