[jboss-cvs] JBossAS SVN: r109089 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager: pool/strategy and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 3 08:24:56 EDT 2010
Author: jesper.pedersen
Date: 2010-11-03 08:24:55 -0400 (Wed, 03 Nov 2010)
New Revision: 109089
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/KeyConnectionAssociation.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/CriKey.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/XAResourceWrapperImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/XidWrapperImpl.java
Log:
Improve equals() implementation
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/KeyConnectionAssociation.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/KeyConnectionAssociation.java 2010-11-03 12:24:20 UTC (rev 109088)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/ccm/KeyConnectionAssociation.java 2010-11-03 12:24:55 UTC (rev 109089)
@@ -60,8 +60,15 @@
*/
public boolean equals(Object other)
{
- return (other instanceof KeyConnectionAssociation) &&
- this.metaAwareObject == ((KeyConnectionAssociation) other).metaAwareObject;
+ if (other == this)
+ return true;
+
+ if (other == null || !(other instanceof KeyConnectionAssociation))
+ return false;
+
+ KeyConnectionAssociation kca = (KeyConnectionAssociation)other;
+
+ return metaAwareObject.equals(kca.metaAwareObject);
}
/**
@@ -69,7 +76,7 @@
*/
public String toString()
{
- return Strings.defaultToString(this.metaAwareObject);
+ return Strings.defaultToString(metaAwareObject);
}
/**
@@ -77,7 +84,7 @@
*/
public int hashCode()
{
- return System.identityHashCode(this.metaAwareObject);
+ return System.identityHashCode(metaAwareObject);
}
/**
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/CriKey.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/CriKey.java 2010-11-03 12:24:20 UTC (rev 109088)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/CriKey.java 2010-11-03 12:24:55 UTC (rev 109089)
@@ -63,6 +63,7 @@
{
if (hashCode == Integer.MAX_VALUE)
hashCode = cri.hashCode();
+
return hashCode;
}
@@ -73,15 +74,13 @@
public boolean equals(Object obj)
{
if (this == obj)
- {
return true;
- }
+
if (obj == null || !(obj instanceof CriKey))
- {
return false;
- }
CriKey other = (CriKey) obj;
+
return cri.equals(other.cri) && separateNoTx == other.separateNoTx;
}
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/XAResourceWrapperImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/XAResourceWrapperImpl.java 2010-11-03 12:24:20 UTC (rev 109088)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/XAResourceWrapperImpl.java 2010-11-03 12:24:55 UTC (rev 109089)
@@ -251,7 +251,7 @@
if (xid instanceof XidWrapper)
return xid;
else
- return new XidWrapperImpl(pad, xid);
+ return new XidWrapperImpl(xid, pad);
}
/**
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/XidWrapperImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/XidWrapperImpl.java 2010-11-03 12:24:20 UTC (rev 109088)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/xa/XidWrapperImpl.java 2010-11-03 12:24:55 UTC (rev 109089)
@@ -31,12 +31,12 @@
* A XidWrapper.
*
* @author <a href="weston.price at jboss.com">Weston Price</a>
- * @version $Revision: 85945 $
+ * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
public class XidWrapperImpl implements XidWrapper
{
/** The serialVersionUID */
- private static final long serialVersionUID = 8226195409384804425L;
+ private static final long serialVersionUID = 396520266833097662L;
/** The formatId */
private int formatId;
@@ -52,9 +52,6 @@
/** Cached hashCode() */
private transient int cachedHashCode;
-
- /** Whether or not to pad the id */
- private boolean pad;
/**
* Creates a new XidWrapperImpl instance.
@@ -62,20 +59,19 @@
*/
public XidWrapperImpl(Xid xid)
{
- this(false, xid);
+ this(xid, false);
}
/**
* Creates a new XidWrapperImpl instance.
- * @param pad pad
- * @param xid xid instances
+ * @param xid The Xid instances
+ * @param pad Should the branch qualifier be padded
*/
- public XidWrapperImpl(boolean pad, Xid xid)
+ public XidWrapperImpl(Xid xid, boolean pad)
{
- this.pad = pad;
-
- branchQualifier = (pad) ? new byte[Xid.MAXBQUALSIZE] : new byte[xid.getBranchQualifier().length];
+ this.branchQualifier = pad ? new byte[Xid.MAXBQUALSIZE] : new byte[xid.getBranchQualifier().length];
System.arraycopy(xid.getBranchQualifier(), 0, branchQualifier, 0, xid.getBranchQualifier().length);
+
this.globalTransactionId = xid.getGlobalTransactionId();
this.formatId = xid.getFormatId();
}
@@ -85,9 +81,7 @@
*/
public byte[] getBranchQualifier()
{
- byte[] temp = this.branchQualifier.clone();
-
- return temp;
+ return branchQualifier.clone();
}
/**
@@ -95,7 +89,7 @@
*/
public int getFormatId()
{
- return this.formatId;
+ return formatId;
}
/**
@@ -103,9 +97,7 @@
*/
public byte[] getGlobalTransactionId()
{
- byte[] temp = this.globalTransactionId.clone();
-
- return temp;
+ return globalTransactionId.clone();
}
/**
@@ -113,12 +105,13 @@
*/
public boolean equals(Object object)
{
+ if (object == this)
+ return true;
+
if (object == null || !(object instanceof Xid))
- {
return false;
- }
- Xid other = (Xid) object;
+ Xid other = (Xid)object;
return
(
formatId == other.getFormatId() &&
More information about the jboss-cvs-commits
mailing list