You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jp...@apache.org on 2016/07/21 00:55:03 UTC
nifi git commit: NIFI-2333: Consider reporting tasks and controller
services when determining whether or not flow is empty
Repository: nifi
Updated Branches:
refs/heads/master 10b91ffe6 -> 370d88eee
NIFI-2333: Consider reporting tasks and controller services when determining whether or not flow is empty
This closes #693
Signed-off-by: jpercivall <jo...@yahoo.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/370d88ee
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/370d88ee
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/370d88ee
Branch: refs/heads/master
Commit: 370d88eeebcc3c02d5452a3c77e545093c45db3f
Parents: 10b91ff
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jul 20 15:25:32 2016 -0400
Committer: jpercivall <jo...@yahoo.com>
Committed: Wed Jul 20 20:06:05 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/nifi/controller/StandardFlowSynchronizer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/370d88ee/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
index 8a6be16..d6dee2c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
@@ -162,7 +162,7 @@ public class StandardFlowSynchronizer implements FlowSynchronizer {
try {
if (initialized) {
existingFlow = toBytes(controller);
- existingFlowEmpty = controller.getGroup(controller.getRootGroupId()).isEmpty();
+ existingFlowEmpty = controller.getGroup(controller.getRootGroupId()).isEmpty() && controller.getAllReportingTasks().isEmpty() && controller.getAllControllerServices().isEmpty();
} else {
existingFlow = readFlowFromDisk();
if (existingFlow == null || existingFlow.length == 0) {