stop ssh

alibaba · May 17, 2023 · 0daca93 · 0daca93
1 parent dcfa4f6
commit 0daca93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...rt/src/main/java/com/alibaba/dbhub/server/domain/support/datasource/DataSourceManger.java b/...rt/src/main/java/com/alibaba/dbhub/server/domain/support/datasource/DataSourceManger.java
@@ -5,6 +5,7 @@
 package com.alibaba.dbhub.server.domain.support.datasource;
 
 import java.net.MalformedURLException;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -15,6 +16,8 @@
 import com.alibaba.dbhub.server.domain.support.sql.DbhubContext;
 import com.alibaba.dbhub.server.domain.support.sql.IDriverManager;
 
+import org.springframework.util.ObjectUtils;
+
 /**
  * @author jipengfei
  * @version : DataSourceManger.java
@@ -70,7 +73,7 @@ private static IDataSource createDataSource(ConnectInfo connectInfo) throws Malf
         dataSource.setPassword(connectInfo.getPassword());
         dataSource.setConnectionErrorRetryAttempts(2);
         dataSource.setBreakAfterAcquireFailure(true);
-        if (connectInfo.getExtendInfo() != null) {
+        if (!ObjectUtils.isEmpty(connectInfo.getExtendMap())) {
             Properties properties = new Properties();
             properties.putAll(connectInfo.getExtendMap());
             dataSource.setConnectProperties(properties);

diff --git a/...domain-support/src/main/java/com/alibaba/dbhub/server/domain/support/sql/ConnectInfo.java b/...domain-support/src/main/java/com/alibaba/dbhub/server/domain/support/sql/ConnectInfo.java
@@ -133,7 +133,7 @@ public class ConnectInfo {
      */
     public LinkedHashMap<String,Object> getExtendMap() {
         if (ObjectUtils.isEmpty(extendInfo)) {
-            return null;
+            return new LinkedHashMap<>();
         }
         LinkedHashMap<String,Object> map = new LinkedHashMap<>();
         for (KeyValue keyValue : extendInfo) {