Repository: nifi Updated Branches: refs/heads/master 87d96c022 -> b2ce6f1f9
NIFI-1755 Fixed remote process group status counts by only considering connected remote ports This closes #347 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b2ce6f1f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b2ce6f1f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b2ce6f1f Branch: refs/heads/master Commit: b2ce6f1f96a0efedbffe71f33768df9d32cdd910 Parents: 87d96c0 Author: Pierre Villard <[email protected]> Authored: Wed Apr 13 11:31:23 2016 +0200 Committer: Oleg Zhurakousky <[email protected]> Committed: Mon May 16 13:37:51 2016 -0400 ---------------------------------------------------------------------- .../apache/nifi/controller/FlowController.java | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/b2ce6f1f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java index fd770b8..4243712 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java @@ -2472,7 +2472,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R // determine if this input port is connected final boolean isConnected = port.hasIncomingConnection(); - // we only want to conside remote ports that we are connected to + // we only want to consider remote ports that we are connected to if (isConnected) { if (port.isRunning()) { activePortCount++; @@ -2481,15 +2481,15 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R } activeThreadCount += processScheduler.getActiveThreadCount(port); - } - final FlowFileEvent portEvent = statusReport.getReportEntry(port.getIdentifier()); - if (portEvent != null) { - lineageMillis += portEvent.getAggregateLineageMillis(); - flowFilesRemoved += portEvent.getFlowFilesRemoved(); - flowFilesTransferred += portEvent.getFlowFilesOut(); - sentCount += portEvent.getFlowFilesSent(); - sentContentSize += portEvent.getBytesSent(); + final FlowFileEvent portEvent = statusReport.getReportEntry(port.getIdentifier()); + if (portEvent != null) { + lineageMillis += portEvent.getAggregateLineageMillis(); + flowFilesRemoved += portEvent.getFlowFilesRemoved(); + flowFilesTransferred += portEvent.getFlowFilesOut(); + sentCount += portEvent.getFlowFilesSent(); + sentContentSize += portEvent.getBytesSent(); + } } } @@ -2497,7 +2497,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R // determine if this output port is connected final boolean isConnected = !port.getConnections().isEmpty(); - // we only want to conside remote ports that we are connected from + // we only want to consider remote ports that we are connected from if (isConnected) { if (port.isRunning()) { activePortCount++; @@ -2506,12 +2506,12 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R } activeThreadCount += processScheduler.getActiveThreadCount(port); - } - final FlowFileEvent portEvent = statusReport.getReportEntry(port.getIdentifier()); - if (portEvent != null) { - receivedCount += portEvent.getFlowFilesReceived(); - receivedContentSize += portEvent.getBytesReceived(); + final FlowFileEvent portEvent = statusReport.getReportEntry(port.getIdentifier()); + if (portEvent != null) { + receivedCount += portEvent.getFlowFilesReceived(); + receivedContentSize += portEvent.getBytesReceived(); + } } }
