Author: orudyy
Date: Mon Nov 21 16:24:20 2016
New Revision: 1770717
URL: http://svn.apache.org/viewvc?rev=1770717&view=rev
Log:
QPID-7537: Improve implementations of equal methods in various classes to be
able to account for sub-classes
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
Mon Nov 21 16:24:20 2016
@@ -252,12 +252,7 @@ class HeadersBinding
return true;
}
- if (o == null)
- {
- return false;
- }
-
- if (!(o instanceof HeadersBinding))
+ if (o == null || getClass() != o.getClass())
{
return false;
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/AMQPProtocolVersionWrapper.java
Mon Nov 21 16:24:20 2016
@@ -79,7 +79,7 @@ public class AMQPProtocolVersionWrapper
{
return true;
}
- if (!(o instanceof AMQPProtocolVersionWrapper))
+ if (o == null || getClass() != o.getClass())
{
return false;
}
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
Mon Nov 21 16:24:20 2016
@@ -62,7 +62,7 @@ class InetNetwork
public boolean equals(Object obj)
{
return (obj != null) &&
- (obj instanceof InetNetwork) &&
+ (getClass() == obj.getClass()) &&
((InetNetwork) obj).network.equals(network) &&
((InetNetwork) obj).netmask.equals(netmask);
}
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Mon Nov 21 16:24:20 2016
@@ -673,7 +673,7 @@ public abstract class AMQDestination imp
{
return true;
}
- if (!(o instanceof AMQDestination))
+ if (o == null || getClass() != o.getClass())
{
return false;
}
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
Mon Nov 21 16:24:20 2016
@@ -385,7 +385,12 @@ public class BrokerDetails implements Se
public boolean equals(Object o)
{
- if (!(o instanceof BrokerDetails))
+ if (this == o)
+ {
+ return true;
+ }
+
+ if (o == null || getClass() != o.getClass())
{
return false;
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/dtx/XidImpl.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
(original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/dtx/XidImpl.java Mon
Nov 21 16:24:20 2016
@@ -188,7 +188,7 @@ public class XidImpl implements Xid
{
return true;
}
- if (o instanceof XidImpl)
+ if (o != null && getClass() == o.getClass())
{
XidImpl other = (XidImpl) o;
if (_formatID == other.getFormatId())
Modified:
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java
(original)
+++
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java
Mon Nov 21 16:24:20 2016
@@ -1173,12 +1173,7 @@ public class FieldTable
return true;
}
- if (o == null)
- {
- return false;
- }
-
- if (!(o instanceof FieldTable))
+ if (o == null || getClass() != o.getClass())
{
return false;
}
Modified:
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
(original)
+++
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
Mon Nov 21 16:24:20 2016
@@ -96,7 +96,12 @@ public class ProtocolInitiation extends
public boolean equals(Object o)
{
- if (!(o instanceof ProtocolInitiation))
+ if (this == o)
+ {
+ return true;
+ }
+
+ if (o == null || getClass() != o.getClass())
{
return false;
}
Modified:
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
(original)
+++
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
Mon Nov 21 16:24:20 2016
@@ -317,7 +317,12 @@ public class QpidRAConnectionRequestInfo
@Override
public boolean equals(final Object obj)
{
- if (obj instanceof QpidRAConnectionRequestInfo)
+ if (this == obj)
+ {
+ return true;
+ }
+
+ if (obj != null && getClass() == obj.getClass())
{
QpidRAConnectionRequestInfo you = (QpidRAConnectionRequestInfo)obj;
return Util.compare(_userName, you.getUserName()) &&
Util.compare(_password, you.getPassword()) &&
Modified:
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
(original)
+++
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
Mon Nov 21 16:24:20 2016
@@ -309,7 +309,12 @@ public class QpidRAManagedConnectionFact
@Override
public boolean equals(final Object obj)
{
- if (obj instanceof QpidRAManagedConnectionFactory)
+ if (this == obj)
+ {
+ return true;
+ }
+
+ if (obj != null && getClass() == obj.getClass())
{
QpidRAManagedConnectionFactory other =
(QpidRAManagedConnectionFactory)obj;
Modified:
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
(original)
+++
qpid/java/trunk/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
Mon Nov 21 16:24:20 2016
@@ -522,19 +522,17 @@ public class QpidResourceAdapter impleme
*/
public boolean equals(final Object obj)
{
- if (obj == null)
+ if (this == null)
{
- return false;
+ return true;
}
- if (obj instanceof QpidResourceAdapter)
- {
- return
_raProperties.equals(((QpidResourceAdapter)obj).getProperties());
- }
- else
+ if (obj == null || getClass() != obj.getClass())
{
return false;
}
+
+ return _raProperties.equals(((QpidResourceAdapter)obj).getProperties());
}
/**
Modified:
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java
(original)
+++
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/ListPropertyValue.java
Mon Nov 21 16:24:20 2016
@@ -103,7 +103,7 @@ public class ListPropertyValue extends G
{
return true;
}
- if (obj == null || !(obj instanceof ListPropertyValue))
+ if (obj == null || getClass() != obj.getClass())
{
return false;
}
Modified:
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
(original)
+++
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
Mon Nov 21 16:24:20 2016
@@ -155,7 +155,7 @@ public abstract class NumericGeneratedPr
{
return true;
}
- if (obj == null || !(obj instanceof NumericGeneratedPropertySupport))
+ if (obj == null || getClass() != obj.getClass())
{
return false;
}
Modified:
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java?rev=1770717&r1=1770716&r2=1770717&view=diff
==============================================================================
---
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java
(original)
+++
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/client/property/RangePropertyValue.java
Mon Nov 21 16:24:20 2016
@@ -109,7 +109,7 @@ public class RangePropertyValue extends
{
return true;
}
- if (!(obj instanceof RangePropertyValue))
+ if (obj == null || getClass() != obj.getClass())
{
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
