Repository: nifi Updated Branches: refs/heads/master 3ecccf02d -> 10803c81d
NIFI-1269: Ensure that we roll back session if not transferring FlowFile Signed-off-by: joewitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d1395ea7 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d1395ea7 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d1395ea7 Branch: refs/heads/master Commit: d1395ea7eea71fa20b520bc61d9278b2a1b33938 Parents: 3ecccf0 Author: Mark Payne <[email protected]> Authored: Mon Dec 7 21:13:57 2015 -0500 Committer: joewitt <[email protected]> Committed: Mon Dec 7 21:18:33 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/processors/standard/DistributeLoad.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/d1395ea7/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java index 73ada84..8c1f9bd 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java @@ -351,6 +351,9 @@ public class DistributeLoad extends AbstractProcessor { final int numRelationships = context.getProperty(NUM_RELATIONSHIPS).asInteger(); final boolean allDestinationsAvailable = (available.size() == numRelationships); if (!allDestinationsAvailable && strategy.requiresAllDestinationsAvailable()) { + // can't transfer the FlowFiles. Roll back and yield + session.rollback(); + context.yield(); return; }
