Repository: commons-dbcp Updated Branches: refs/heads/master a310596a7 -> 80d570d77
Use Eclipse generated hashCode() and equals(). Better ivar 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/80d570d7 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/80d570d7 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/80d570d7 Branch: refs/heads/master Commit: 80d570d77a6f0ff71bea6fddb6519d6bc77f408b Parents: a310596 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sat Jun 9 08:48:29 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sat Jun 9 08:48:29 2018 -0600 ---------------------------------------------------------------------- .../commons/dbcp2/datasources/PoolKey.java | 50 +++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/80d570d7/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 763e90b..3924aac 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java @@ -26,40 +26,56 @@ class PoolKey implements Serializable { private static final long serialVersionUID = 2252771047542484533L; private final String dataSourceName; - private final String username; + private final String userName; PoolKey(final String dataSourceName, final String username) { this.dataSourceName = dataSourceName; - this.username = username; + this.userName = username; } @Override - 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)) && - (null == username ? null == pk.username : username.equals(pk.username)); + public boolean equals(Object obj) { + if (this == obj) { + return true; } - return false; + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + PoolKey other = (PoolKey) obj; + if (dataSourceName == null) { + if (other.dataSourceName != null) { + return false; + } + } else if (!dataSourceName.equals(other.dataSourceName)) { + return false; + } + if (userName == null) { + if (other.userName != null) { + return false; + } + } else if (!userName.equals(other.userName)) { + return false; + } + return true; } @Override public int hashCode() { - int h = 0; - if (dataSourceName != null) { - h += dataSourceName.hashCode(); - } - if (username != null) { - h = 29 * h + username.hashCode(); - } - return h; + final int prime = 31; + int result = 1; + result = prime * result + ((dataSourceName == null) ? 0 : dataSourceName.hashCode()); + result = prime * result + ((userName == null) ? 0 : userName.hashCode()); + return result; } @Override 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(); }
