You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/11/15 21:19:09 UTC
nifi git commit: NIFI-2751 - Pull batch in round-robin manner - fix
for / by 0
Repository: nifi
Updated Branches:
refs/heads/master 76b859c4e -> 45bc3e054
NIFI-2751 - Pull batch in round-robin manner - fix for / by 0
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/45bc3e05
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/45bc3e05
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/45bc3e05
Branch: refs/heads/master
Commit: 45bc3e054d3c241e6abf79fc1dfe4bf22ae90a6f
Parents: 76b859c
Author: Pierre Villard <pi...@gmail.com>
Authored: Sat Nov 12 12:10:43 2016 +0100
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Nov 15 16:19:00 2016 -0500
----------------------------------------------------------------------
.../nifi/controller/repository/StandardProcessSession.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/45bc3e05/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index a2a68d5..a696e79 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -1443,6 +1443,10 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
// get batch of flow files in a round-robin manner
final List<Connection> connections = context.getPollableConnections();
+ if(connections.isEmpty()) {
+ return Collections.emptyList();
+ }
+
final Connection connection = connections.get(context.getNextIncomingConnectionIndex() % connections.size());
return get(connection, new QueuePoller() {