Author: rajith
Date: Wed Mar 13 15:39:24 2013
New Revision: 1456008
URL: http://svn.apache.org/r1456008
Log:
QPID-3769 Modified the hashcode impl to match equals. Added a test case
to verify equals and hashcode for ADDR based destinations.
Added:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=1456008&r1=1456007&r2=1456008&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Wed Mar 13 15:39:24 2013
@@ -676,13 +676,19 @@ public abstract class AMQDestination imp
public int hashCode()
{
int result;
- result = _exchangeName == null ? "".hashCode() :
_exchangeName.hashCode();
- result = 29 * result + (_exchangeClass == null ? "".hashCode()
:_exchangeClass.hashCode());
- if (_queueName != null)
+ if (_destSyntax == DestSyntax.ADDR)
{
- result = 29 * result + _queueName.hashCode();
+ result = 29 * _addressType + _name.hashCode();
+ }
+ else
+ {
+ result = _exchangeName == null ? "".hashCode() :
_exchangeName.hashCode();
+ result = 29 * result + (_exchangeClass == null ? "".hashCode()
:_exchangeClass.hashCode());
+ if (_queueName != null)
+ {
+ result = 29 * result + _queueName.hashCode();
+ }
}
-
return result;
}
Added:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java?rev=1456008&view=auto
==============================================================================
---
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
(added)
+++
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
Wed Mar 13 15:39:24 2013
@@ -0,0 +1,46 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.client;
+
+import junit.framework.TestCase;
+
+public class AMQDestinationTest extends TestCase
+{
+ public void testEqaulsAndHashCodeForAddressBasedDestinations() throws
Exception
+ {
+ AMQDestination dest = new AMQQueue("ADDR:Foo; {node :{type:queue}}");
+ AMQDestination dest1 = new AMQQueue("ADDR:Foo; {node :{type:topic}}");
+ AMQDestination dest2 = new AMQQueue(
+ "ADDR:Foo; {create:always,node :{type:queue}}");
+ String bUrl = "direct://amq.direct/test-route/Foo?routingkey='Foo'";
+ AMQDestination dest3 = new AMQQueue(bUrl);
+
+ assertTrue(dest.equals(dest));
+ assertFalse(dest.equals(dest1));
+ assertTrue(dest.equals(dest2));
+ assertFalse(dest.equals(dest3));
+
+ assertTrue(dest.hashCode() == dest.hashCode());
+ assertTrue(dest.hashCode() != dest1.hashCode());
+ assertTrue(dest.hashCode() == dest2.hashCode());
+ assertTrue(dest.hashCode() != dest3.hashCode());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
