From 967916516167cdcd4c96c7dd372ad6029a38969a Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 11 Feb 2022 13:35:37 +0800
Subject: [PATCH] fix c3p0 bug

---
 CHANGELOG.md                                  |  3 +-
 .../cn/hutool/db/ds/c3p0/C3p0DSFactory.java   | 30 +++++++++++--------
 .../src/test/java/cn/hutool/db/DsTest.java    | 11 +++++++
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6686d2456..f0986a70d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.7.21 (2022-02-07)
+# 5.7.21 (2022-02-11)
 
 ### 🐣新特性
 * 【extra  】     增加jetbrick模板支持
@@ -24,6 +24,7 @@
 * 【extra  】     修复EmojiUtil.toHtmlHex()方法（pr#519@Gitee）
 * 【system 】     修复CpuInfo.getUsed()方法（issue#2116@Github）
 * 【dfa    】     修复密集匹配和贪婪匹配冲突问题（issue#2126@Github）
+* 【db     】     修复c3p0丢失信息问题（issue#I4T7XZ@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.7.20 (2022-01-20)
diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
index ecc7a4371..4f11a56bc 100644
--- a/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
+++ b/hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
@@ -1,5 +1,6 @@
 package cn.hutool.db.ds.c3p0;
 
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.ds.AbstractDSFactory;
@@ -12,13 +13,13 @@ import java.beans.PropertyVetoException;
 
 /**
  * Druid数据源工厂类
- * 
+ *
  * @author Looly
  *
  */
 public class C3p0DSFactory extends AbstractDSFactory {
 	private static final long serialVersionUID = -6090788225842047281L;
-	
+
 	public static final String DS_NAME = "C3P0";
 
 	/**
@@ -30,24 +31,16 @@ public class C3p0DSFactory extends AbstractDSFactory {
 
 	/**
 	 * 构造
-	 * 
+	 *
 	 * @param setting 配置
 	 */
 	public C3p0DSFactory(Setting setting) {
 		super(DS_NAME, ComboPooledDataSource.class, setting);
 	}
-	
+
 	@Override
 	protected DataSource createDataSource(String jdbcUrl, String driver, String user, String pass, Setting poolSetting) {
 		final ComboPooledDataSource ds = new ComboPooledDataSource();
-		ds.setJdbcUrl(jdbcUrl);
-		try {
-			ds.setDriverClass(driver);
-		} catch (PropertyVetoException e) {
-			throw new DbRuntimeException(e);
-		}
-		ds.setUser(user);
-		ds.setPassword(pass);
 
 		// remarks等特殊配置，since 5.3.8
 		final Props connProps = new Props();
@@ -58,7 +51,18 @@ public class C3p0DSFactory extends AbstractDSFactory {
 				connProps.setProperty(key, connValue);
 			}
 		}
-		ds.setProperties(connProps);
+		if(MapUtil.isNotEmpty(connProps)){
+			ds.setProperties(connProps);
+		}
+
+		ds.setJdbcUrl(jdbcUrl);
+		try {
+			ds.setDriverClass(driver);
+		} catch (PropertyVetoException e) {
+			throw new DbRuntimeException(e);
+		}
+		ds.setUser(user);
+		ds.setPassword(pass);
 
 		// 注入属性
 		poolSetting.toBean(ds);
diff --git a/hutool-db/src/test/java/cn/hutool/db/DsTest.java b/hutool-db/src/test/java/cn/hutool/db/DsTest.java
index 1d89ca6b1..cec55a376 100644
--- a/hutool-db/src/test/java/cn/hutool/db/DsTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/DsTest.java
@@ -2,6 +2,7 @@ package cn.hutool.db;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.db.ds.DSFactory;
+import cn.hutool.db.ds.DataSourceWrapper;
 import cn.hutool.db.ds.bee.BeeDSFactory;
 import cn.hutool.db.ds.c3p0.C3p0DSFactory;
 import cn.hutool.db.ds.dbcp.DbcpDSFactory;
@@ -9,6 +10,7 @@ import cn.hutool.db.ds.druid.DruidDSFactory;
 import cn.hutool.db.ds.hikari.HikariDSFactory;
 import cn.hutool.db.ds.pooled.PooledDSFactory;
 import cn.hutool.db.ds.tomcat.TomcatDSFactory;
+import com.mchange.v2.c3p0.ComboPooledDataSource;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -87,6 +89,15 @@ public class DsTest {
 		Assert.assertTrue(CollUtil.isNotEmpty(all));
 	}
 
+	@Test
+	public void c3p0DsUserAndPassTest() {
+		// https://gitee.com/dromara/hutool/issues/I4T7XZ
+		DSFactory.setCurrentDSFactory(new C3p0DSFactory());
+		ComboPooledDataSource ds = (ComboPooledDataSource) ((DataSourceWrapper) DSFactory.get("mysql")).getRaw();
+		Assert.assertEquals("root", ds.getUser());
+		Assert.assertEquals("123456", ds.getPassword());
+	}
+
 	@Test
 	public void hutoolPoolTest() throws SQLException {
 		DSFactory.setCurrentDSFactory(new PooledDSFactory());