dbeaver#22963 Add not null condition

longhaseng52 · Mar 22, 2024 · 2c94499 · 2c94499
1 parent 68eaa27
commit 2c94499
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/plugins/org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridTable.java b/plugins/org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridTable.java
@@ -65,7 +65,8 @@ public CubridTable(
                 this.setSystem(type.equals("YES"));
             }
         } else {
-            ownerName = getDataSource().getContainer().getConnectionConfiguration().getUserName().toUpperCase();
+            ownerName = getDataSource().getContainer().getConnectionConfiguration().getUserName();
+            ownerName = ownerName != null ? ownerName.toUpperCase() : "";
             collationName = CubridConstants.DEFAULT_COLLATION;
         }
 

diff --git a/plugins/org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridUser.java b/plugins/org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridUser.java
@@ -95,7 +95,7 @@ public boolean supportsSynonym() {
 
     @NotNull
     public boolean supportsTrigger() {
-        return this.getDataSource().getContainer().getConnectionConfiguration().getUserName().equals("dba");
+        return "dba".equals(getDataSource().getContainer().getConnectionConfiguration().getUserName());
     }
 
     @NotNull