From 2c944998d2bca70ba9c51709c6309c0643ba742f Mon Sep 17 00:00:00 2001
From: Longha Seng <senglongha.tech@gmail.com>
Date: Fri, 22 Mar 2024 14:14:14 +0700
Subject: [PATCH] #22963 Add not null condition

---
 .../src/org/jkiss/dbeaver/ext/cubrid/model/CubridTable.java    | 3 ++-
 .../src/org/jkiss/dbeaver/ext/cubrid/model/CubridUser.java     | 2 +-
 2 files changed, 3 insertions(+), 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
index b06de670eccf..8a75a79689ca 100644
--- 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
index 71f92bba9b8b..64f10ce6b978 100644
--- 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