Handle null pointer when schema name is null

agrawalreetika · tdcmeehan · commit 6873c7e31746 · 2022-08-18T13:30:29.000-04:00
diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadata.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcMetadata.java
@@ -130,11 +130,11 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess
     {
         ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> columns = ImmutableMap.builder();
         List<SchemaTableName> tables;
-        if (prefix.getTableName() != null) {
+        if (prefix.getSchemaName() != null && prefix.getTableName() != null) {
             tables = ImmutableList.of(new SchemaTableName(prefix.getSchemaName(), prefix.getTableName()));
         }
         else {
-            tables = listTables(session, Optional.of(prefix.getSchemaName()));
+            tables = listTables(session, Optional.ofNullable(prefix.getSchemaName()));
         }
         for (SchemaTableName tableName : tables) {
             try {

Original file line number	Diff line number	Diff line change
`@@ -130,11 +130,11 @@ public Map<SchemaTableName, List<ColumnMetadata>> listTableColumns(ConnectorSess`
`130`	`130`	`{`
`131`	`131`	`ImmutableMap.Builder<SchemaTableName, List<ColumnMetadata>> columns = ImmutableMap.builder();`
`132`	`132`	`List<SchemaTableName> tables;`
`133`		`- if (prefix.getTableName() != null) {`
	`133`	`+ if (prefix.getSchemaName() != null && prefix.getTableName() != null) {`
`134`	`134`	`tables = ImmutableList.of(new SchemaTableName(prefix.getSchemaName(), prefix.getTableName()));`
`135`	`135`	`}`
`136`	`136`	`else {`
`137`		`- tables = listTables(session, Optional.of(prefix.getSchemaName()));`
	`137`	`+ tables = listTables(session, Optional.ofNullable(prefix.getSchemaName()));`
`138`	`138`	`}`
`139`	`139`	`for (SchemaTableName tableName : tables) {`
`140`	`140`	`try {`