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/09 14:44:17 UTC
commons-dbcp git commit: Better ivar and param names.
Repository: commons-dbcp
Updated Branches:
refs/heads/master 53b6258b2 -> a310596a7
Better ivar and param names.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/a310596a
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/a310596a
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/a310596a
Branch: refs/heads/master
Commit: a310596a75ce3e0cccf268102f070ce85cf9384b
Parents: 53b6258
Author: Gary Gregory <ga...@gmail.com>
Authored: Sat Jun 9 08:44:14 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sat Jun 9 08:44:14 2018 -0600
----------------------------------------------------------------------
.../org/apache/commons/dbcp2/datasources/PoolKey.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/a310596a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
index 1f36e50..763e90b 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
@@ -25,11 +25,11 @@ import java.io.Serializable;
class PoolKey implements Serializable {
private static final long serialVersionUID = 2252771047542484533L;
- private final String datasourceName;
+ private final String dataSourceName;
private final String username;
- PoolKey(final String datasourceName, final String username) {
- this.datasourceName = datasourceName;
+ PoolKey(final String dataSourceName, final String username) {
+ this.dataSourceName = dataSourceName;
this.username = username;
}
@@ -37,7 +37,7 @@ class PoolKey implements Serializable {
public boolean equals(final Object obj) {
if (obj instanceof PoolKey) {
final PoolKey pk = (PoolKey)obj;
- return (null == datasourceName ? null == pk.datasourceName : datasourceName.equals(pk.datasourceName)) &&
+ return (null == dataSourceName ? null == pk.dataSourceName : dataSourceName.equals(pk.dataSourceName)) &&
(null == username ? null == pk.username : username.equals(pk.username));
}
return false;
@@ -46,8 +46,8 @@ class PoolKey implements Serializable {
@Override
public int hashCode() {
int h = 0;
- if (datasourceName != null) {
- h += datasourceName.hashCode();
+ if (dataSourceName != null) {
+ h += dataSourceName.hashCode();
}
if (username != null) {
h = 29 * h + username.hashCode();
@@ -59,7 +59,7 @@ class PoolKey implements Serializable {
public String toString() {
final StringBuffer sb = new StringBuffer(50);
sb.append("PoolKey(");
- sb.append(username).append(", ").append(datasourceName);
+ sb.append(username).append(", ").append(dataSourceName);
sb.append(')');
return sb.toString();
}