From 9f5a0e64e96be4f85a010563c9cb72a42b59a09c Mon Sep 17 00:00:00 2001
From: Pedro Matias <pedro.matias@dremio.com>
Date: Thu, 5 Feb 2026 01:44:09 +0000
Subject: [PATCH 1/2] Add test

---
 .../jdbc/ArrowFlightJdbcDriverTest.java       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java b/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java
index ae355829d7..88fb9889b6 100644
--- a/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java
+++ b/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java
@@ -201,6 +201,30 @@ public void testConnectWithInsensitiveCasePropertyKeys2() throws Exception {
     }
   }
 
+  /**
+   * Tests whether the {@link ArrowFlightJdbcDriver} can establish a successful connection to the
+   * Arrow Flight client when provided with null properties.
+   */
+  @Test
+  public void testConnectWithNullProperties() throws Exception {
+    final Driver driver = new ArrowFlightJdbcDriver();
+    try (Connection connection =
+        driver.connect(
+            "jdbc:arrow-flight://"
+                + dataSource.getConfig().getHost()
+                + ":"
+                + dataSource.getConfig().getPort()
+                + "?"
+                + "useEncryption=false"
+                + "&user="
+                + dataSource.getConfig().getUser()
+                + "&password="
+                + dataSource.getConfig().getPassword(),
+            null)) {
+      assertTrue(connection.isValid(300));
+    }
+  }
+
   /**
    * Tests whether an exception is thrown upon attempting to connect to a malformed URI.
    *

From 010bbd2d0471f529e83bd32c0f3970e54d6aad0d Mon Sep 17 00:00:00 2001
From: Pedro Matias <pedro.matias@dremio.com>
Date: Thu, 5 Feb 2026 02:08:20 +0000
Subject: [PATCH 2/2] Fix NPE

---
 .../org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java b/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
index 53e6120f62..12ef8030d7 100644
--- a/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
+++ b/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
@@ -75,7 +75,9 @@ public Logger getParentLogger() {
   public ArrowFlightConnection connect(final String url, final Properties info)
       throws SQLException {
     final Properties properties = new Properties(info);
-    properties.putAll(info);
+    if (info != null) {
+      properties.putAll(info);
+    }
 
     if (url != null) {
       final Optional<Map<Object, Object>> maybeProperties = getUrlsArgs(url);