From a11a5acfda6827cf191eb927164905451943ce3a Mon Sep 17 00:00:00 2001
From: David Li <David.M.Li@twosigma.com>
Date: Mon, 28 Jan 2019 11:49:46 -0500
Subject: [PATCH] Don't hang in Flight DoPut if server sends exception

---
 .../src/main/java/org/apache/arrow/flight/FlightClient.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/flight/src/main/java/org/apache/arrow/flight/FlightClient.java b/java/flight/src/main/java/org/apache/arrow/flight/FlightClient.java
index 74e73d1f83623..7fcfd52008f98 100644
--- a/java/flight/src/main/java/org/apache/arrow/flight/FlightClient.java
+++ b/java/flight/src/main/java/org/apache/arrow/flight/FlightClient.java
@@ -211,7 +211,8 @@ public PutObserver(VectorUnloader unloader, ClientCallStreamObserver<ArrowMessag
     @Override
     public void putNext() {
       ArrowRecordBatch batch = unloader.getRecordBatch();
-      while (!observer.isReady()) {
+      // Check the futureResult in case server sent an exception
+      while (!observer.isReady() && !futureResult.isDone()) {
         /* busy wait */
       }
       observer.onNext(new ArrowMessage(batch));