Avoid NPE for optional ownerType field

fixes #11131 pr-link: #11130 change-id: cid-cb1e33b31114f6d2196398ea40275b4b891fc1a6
Alluxio · Mar 6, 2020 · 89fc2d3 · 89fc2d3
1 parent d549200
commit 89fc2d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/table/server/master/src/main/java/alluxio/master/table/Database.java b/table/server/master/src/main/java/alluxio/master/table/Database.java
@@ -241,7 +241,7 @@ public SyncStatus sync(JournalContext context, ExecutorService service) throws I
     try {
       CommonUtils.invokeAll(service, tasks, mUdbSyncTimeoutMs);
     } catch (Exception e) {
-      throw new IOException("Failed to sync database " + mName, e);
+      throw new IOException("Failed to sync database " + mName + ". error: " + e.getMessage(), e);
     }
 
     for (Table existingTable : mTables.values()) {

diff --git a/table/server/underdb/hive/src/main/java/alluxio/table/under/hive/HiveDatabase.java b/table/server/underdb/hive/src/main/java/alluxio/table/under/hive/HiveDatabase.java
@@ -111,7 +111,7 @@ public DatabaseInfo getDatabaseInfo() throws IOException {
     try (CloseableResource<IMetaStoreClient> client = mClientPool.acquireClientResource()) {
       Database hiveDb = client.get().getDatabase(mHiveDbName);
       alluxio.grpc.table.PrincipalType type = alluxio.grpc.table.PrincipalType.USER;
-      if (hiveDb.getOwnerType().equals(PrincipalType.ROLE)) {
+      if (Objects.equals(hiveDb.getOwnerType(), PrincipalType.ROLE)) {
         type = alluxio.grpc.table.PrincipalType.ROLE;
       }
       return new DatabaseInfo(hiveDb.getLocationUri(), hiveDb.getOwnerName(), type,