From eb25c2f2ec879c369c7deb84a4273bec1fad42cc Mon Sep 17 00:00:00 2001
From: Padma Penumarthy <ppenumar97@yahoo.com>
Date: Mon, 9 Oct 2017 15:05:17 -0700
Subject: [PATCH] DRILL-5854: IllegalStateException when empty batch with valid
 schema is received

---
 .../exec/physical/impl/mergereceiver/MergingRecordBatch.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java
index 35c1f818436..eff1ae9f598 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/mergereceiver/MergingRecordBatch.java
@@ -224,6 +224,7 @@ public IterOutcome innerNext() {
         if (rawBatch == null) {
           createDummyBatch = true;
           rawBatches.add(rawBatch);
+          p++; // move to next sender
           continue;
         }