From 45bc3e054d3c241e6abf79fc1dfe4bf22ae90a6f Mon Sep 17 00:00:00 2001
From: Pierre Villard <pierre.villard.fr@gmail.com>
Date: Sat, 12 Nov 2016 12:10:43 +0100
Subject: [PATCH] NIFI-2751 - Pull batch in round-robin manner - fix for / by 0

---
 .../nifi/controller/repository/StandardProcessSession.java    | 4 ++++
 1 file changed, 4 insertions(+)

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 a2a68d5549..a696e790ae 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() {