Repository: commons-dbcp Updated Branches: refs/heads/master 633799626 -> 954012287
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/95401228 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/95401228 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/95401228 Branch: refs/heads/master Commit: 9540122871676a511867c3d2ba54bf76401c8a91 Parents: 6337996 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sun Jun 10 12:49:46 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sun Jun 10 12:49:46 2018 -0600 ---------------------------------------------------------------------- .../apache/commons/dbcp2/datasources/SharedPoolDataSource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/95401228/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java index 5873503..e84aa7f 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java @@ -125,13 +125,13 @@ public class SharedPoolDataSource extends InstanceKeyDataSource { // Inherited abstract methods @Override - protected PooledConnectionAndInfo getPooledConnectionAndInfo(final String userName, final String password) + protected PooledConnectionAndInfo getPooledConnectionAndInfo(final String userName, final String userPassword) throws SQLException { synchronized (this) { if (pool == null) { try { - registerPool(userName, password); + registerPool(userName, userPassword); } catch (final NamingException e) { throw new SQLException("RegisterPool failed", e); } @@ -140,7 +140,7 @@ public class SharedPoolDataSource extends InstanceKeyDataSource { PooledConnectionAndInfo info = null; - final UserPassKey key = new UserPassKey(userName, password); + final UserPassKey key = new UserPassKey(userName, userPassword); try { info = pool.borrowObject(key);
