diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index bfdab4701d..d5c4013cb7 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -526,11 +526,11 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource this.password = password; } - public Properties getConnectionProperties() { + public Properties getConnectProperties() { return connectionProperties; } - public void setConnectionProperties(Properties connectionProperties) { + public void setConnectProperties(Properties connectionProperties) { if (inited) { throw new UnsupportedOperationException(); } @@ -827,7 +827,7 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource this.dataSource = dataSource; this.url = dataSource.getUrl(); - Properties properties = dataSource.getConnectionProperties(); + Properties properties = dataSource.getConnectProperties(); String user; if (dataSource.getUserCallback() != null) { user = dataSource.getUserCallback().getName(); @@ -870,7 +870,7 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource password = dataSource.getPassword(); } - this.info = new Properties(dataSource.getConnectionProperties()); + this.info = new Properties(dataSource.getConnectProperties()); if (properties != null) { info.putAll(properties); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java index 59b0724dc3..d6c347056d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java @@ -23,7 +23,7 @@ public class PasswordCallbackTest extends TestCase { conn.close(); Assert.assertEquals(dataSource.getUrl(), passwordCallback.getUrl()); - Assert.assertEquals(dataSource.getConnectionProperties(), passwordCallback.getProperties()); + Assert.assertEquals(dataSource.getConnectProperties(), passwordCallback.getProperties()); } public static class TestPasswordCallback extends PasswordCallback {