[hive] 29/38: HIVE-24396: Fix for NPE in get_database_core with null catalog name

[ngangam]

This is an automated email from the ASF dual-hosted git repository.

ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git

commit 506621c86e9d0c9751c256ebdac78db75e0720ce
Author: Naveen Gangam <ngan...@cloudera.com>
AuthorDate: Tue Dec 1 22:26:42 2020 -0500

    HIVE-24396: Fix for NPE in get_database_core with null catalog name
---
 .../main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index 638b426..d66d928 100644
--- 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -2376,6 +2376,10 @@ public class HiveMetaStore extends ThriftHiveMetastore {
             + " is not a valid object name");
       }
 
+      if (!tbl.isSetCatName()) {
+        tbl.setCatName(getDefaultCatalog(conf));
+      }
+
       Database db = get_database_core(tbl.getCatName(), tbl.getDbName());
       if (db != null && db.getType().equals(DatabaseType.REMOTE)) {
         
DataConnectorProviderFactory.getDataConnectorProvider(db).createTable(tbl);
@@ -2427,9 +2431,6 @@ public class HiveMetaStore extends ThriftHiveMetastore {
       boolean success = false, madeDir = false;
       boolean isReplicated = false;
       try {
-        if (!tbl.isSetCatName()) {
-          tbl.setCatName(getDefaultCatalog(conf));
-        }
         firePreEvent(new PreCreateTableEvent(tbl, this));
 
         ms.openTransaction();