[hive] 07/38: NullPointerException in CreateDatabaseOperation due to last change

[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 c6ed378164f352ed620b5e9647ca6ad2e28a0d7d
Author: Naveen Gangam <ngan...@cloudera.com>
AuthorDate: Tue Nov 17 13:16:46 2020 -0500

    NullPointerException in CreateDatabaseOperation due to last change
---
 .../hadoop/hive/ql/ddl/database/create/CreateDatabaseOperation.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseOperation.java
 
b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseOperation.java
index def742d..d02b039 100644
--- 
a/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseOperation.java
+++ 
b/ql/src/java/org/apache/hadoop/hive/ql/ddl/database/create/CreateDatabaseOperation.java
@@ -54,14 +54,15 @@ public class CreateDatabaseOperation extends 
DDLOperation<CreateDatabaseDesc> {
         if (desc.getManagedLocationUri() != null) {
           database.setManagedLocationUri(desc.getManagedLocationUri());
         }
+        makeLocationQualified(database);
         if 
(database.getLocationUri().equalsIgnoreCase(database.getManagedLocationUri())) {
           throw new HiveException("Managed and external locations for database 
cannot be the same");
         }
       } else {
+        makeLocationQualified(database);
         database.setConnector_name(desc.getConnectorName());
         database.setRemote_dbname(desc.getRemoteDbName());
       }
-      makeLocationQualified(database);
       context.getDb().createDatabase(database, desc.getIfNotExists());
     } catch (AlreadyExistsException ex) {
       //it would be better if AlreadyExistsException had an errorCode field....