From 69bffbdd3ba7d42032db25446b91bc115b757fd6 Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Wed, 22 Dec 2021 08:32:22 -0500
Subject: [PATCH 1/2] MINOR: Fix pom.xml for Flight integration tests

---
 java/flight/flight-integration-tests/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/flight/flight-integration-tests/pom.xml b/java/flight/flight-integration-tests/pom.xml
index 2bd9a9f4e04..1958c3bd504 100644
--- a/java/flight/flight-integration-tests/pom.xml
+++ b/java/flight/flight-integration-tests/pom.xml
@@ -21,7 +21,7 @@
 
     <artifactId>flight-integration-tests</artifactId>
     <name>Arrow Flight Integration Tests</name>
-    <version>7.0.0-SNAPSHOT</version>
+    <description>Integration tests for Flight RPC.</description>
     <packaging>jar</packaging>
 
     <dependencies>

From d9ec637c80acdd5985730cae49ee79e40fc483fa Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Wed, 22 Dec 2021 12:51:59 -0500
Subject: [PATCH 2/2] ARROW-15187: [Java] Try to fix flaky test

---
 .../java/org/apache/arrow/flight/sql/FlightSqlClient.java    | 1 +
 .../apache/arrow/flight/sql/example/FlightSqlExample.java    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java
index c1ff92a3796..069d59edd48 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java
@@ -543,6 +543,7 @@ public FlightInfo execute(final CallOption... options) throws SQLException {
 
         listener.putNext();
         listener.completed();
+        listener.getResult();
       }
 
       return client.getInfo(descriptor, options);
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java
index 634343c236c..90a2aaf1004 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java
@@ -1270,7 +1270,10 @@ public Runnable acceptPutPreparedStatementQuery(CommandPreparedStatementQuery co
         }
 
       } catch (SQLException e) {
-        ackStream.onError(e);
+        ackStream.onError(CallStatus.INTERNAL
+            .withDescription("Failed to bind parameters: " + e.getMessage())
+            .withCause(e)
+            .toRuntimeException());
         return;
       }
       ackStream.onCompleted();