You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/06/10 18:40:11 UTC
commons-dbcp git commit: Better param name.
Repository: commons-dbcp
Updated Branches:
refs/heads/master fe71bba6f -> 633799626
Better param name.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/63379962
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/63379962
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/63379962
Branch: refs/heads/master
Commit: 63379962669775afdacb14cda8a40cf9c4c9a043
Parents: fe71bba
Author: Gary Gregory <ga...@gmail.com>
Authored: Sun Jun 10 12:40:08 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Jun 10 12:40:08 2018 -0600
----------------------------------------------------------------------
.../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/63379962/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
index 9dd7948..475fd41 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
@@ -1011,7 +1011,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable
}
}
- protected ConnectionPoolDataSource testCPDS(final String userName, final String password)
+ protected ConnectionPoolDataSource testCPDS(final String userName, final String userPassword)
throws javax.naming.NamingException, SQLException {
// The source of physical db connections
ConnectionPoolDataSource cpds = this.dataSource;
@@ -1035,7 +1035,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable
PooledConnection conn = null;
try {
if (userName != null) {
- conn = cpds.getPooledConnection(userName, password);
+ conn = cpds.getPooledConnection(userName, userPassword);
} else {
conn = cpds.getPooledConnection();
}