commit 151d88cf27aed51555406903b3947f208c09e1d5
author James Turton <9107319+jnturton@users.noreply.github.com> Tue May 10 18:22:57 2022 +0200
committer GitHub <noreply@github.com> Wed May 11 00:22:57 2022 +0800
tree cbc40a16e0be8cfef5a05408306d0ef51b3f902a
parent f6fa97864d1b7c06a7e6878bce2121afdf76e522

DRILL-8219: Handle null catalog names returned by DB2 in storage-jdbc. (#2542)

contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java

diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java
index 52721f6..dce76aa 100644
--- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java
+++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcCatalogSchema.java
@@ -55,6 +55,11 @@
       connectionSchemaName = con.getSchema();
       while (set.next()) {
         final String catalogName = set.getString(1);
+        if (catalogName == null) {
+          // DB2 is an example of why of this escape is needed.
+          continue;
+        }
+
         CapitalizingJdbcSchema schema = new CapitalizingJdbcSchema(
             getSchemaPath(), catalogName, source, dialect, convention, catalogName, null, caseSensitive);
         schemaMap.put(schema.getName(), schema);