Author: rgodfrey
Date: Mon Feb 20 16:36:24 2012
New Revision: 1291353
URL: http://svn.apache.org/viewvc?rev=1291353&view=rev
Log:
QPID-3095 : AMQBrokerDetails equals() and hashCode() methods do not adhere to
contract
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java?rev=1291353&r1=1291352&r2=1291353&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
Mon Feb 20 16:36:24 2012
@@ -319,18 +319,18 @@ public class AMQBrokerDetails implements
BrokerDetails bd = (BrokerDetails) o;
- return _host.equalsIgnoreCase(bd.getHost()) &&
+ return _host.toLowerCase().equals(bd.getHost() == null ? null :
bd.getHost().toLowerCase()) &&
(_port == bd.getPort()) &&
- _transport.equalsIgnoreCase(bd.getTransport());
+ _transport.toLowerCase().equals(bd.getTransport() == null ?
null : bd.getTransport().toLowerCase());
//TODO do we need to compare all the options as well?
}
@Override
public int hashCode()
{
- int result = _host != null ? _host.hashCode() : 0;
+ int result = _host != null ? _host.toLowerCase().hashCode() : 0;
result = 31 * result + _port;
- result = 31 * result + (_transport != null ? _transport.hashCode() :
0);
+ result = 31 * result + (_transport != null ?
_transport.toLowerCase().hashCode() : 0);
return result;
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
