Modified: qpid/branches/QPID-4659/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=1461870&r1=1461869&r2=1461870&view=diff ============================================================================== --- qpid/branches/QPID-4659/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java (original) +++ qpid/branches/QPID-4659/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java Wed Mar 27 21:58:51 2013 @@ -653,6 +653,17 @@ public abstract class AMQDestination imp { return false; } + if (_subject == null) + { + if (that.getSubject() != null) + { + return false; + } + } + else if (!_subject.equals(that.getSubject())) + { + return false; + } } else { @@ -679,6 +690,10 @@ public abstract class AMQDestination imp if (_destSyntax == DestSyntax.ADDR) { result = 29 * _addressType + _name.hashCode(); + if (_subject != null) + { + result = 29 * result + _subject.hashCode(); + } } else {
Modified: qpid/branches/QPID-4659/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java?rev=1461870&r1=1461869&r2=1461870&view=diff ============================================================================== --- qpid/branches/QPID-4659/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java (original) +++ qpid/branches/QPID-4659/qpid/java/client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java Wed Mar 27 21:58:51 2013 @@ -27,10 +27,10 @@ public class AMQDestinationTest extends public void testEqaulsAndHashCodeForAddressBasedDestinations() throws Exception { AMQDestination dest = new AMQQueue("ADDR:Foo; {node :{type:queue}}"); - AMQDestination dest1 = new AMQQueue("ADDR:Foo; {node :{type:topic}}"); + AMQDestination dest1 = new AMQTopic("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'"; + String bUrl = "BURL:direct://amq.direct/test-route/Foo?routingkey='Foo'"; AMQDestination dest3 = new AMQQueue(bUrl); assertTrue(dest.equals(dest)); @@ -42,5 +42,9 @@ public class AMQDestinationTest extends assertTrue(dest.hashCode() != dest1.hashCode()); assertTrue(dest.hashCode() == dest2.hashCode()); assertTrue(dest.hashCode() != dest3.hashCode()); + + AMQDestination dest4 = new AMQQueue("ADDR:Foo/Bar; {node :{type:queue}}"); + AMQDestination dest5 = new AMQQueue("ADDR:Foo/Bar2; {node :{type:queue}}"); + assertTrue(dest4.hashCode() != dest5.hashCode()); } } Modified: qpid/branches/QPID-4659/qpid/java/common.xml URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/common.xml?rev=1461870&r1=1461869&r2=1461870&view=diff ============================================================================== --- qpid/branches/QPID-4659/qpid/java/common.xml (original) +++ qpid/branches/QPID-4659/qpid/java/common.xml Wed Mar 27 21:58:51 2013 @@ -24,9 +24,9 @@ <property name="project.name" value="qpid"/> <!-- Version used for standard build output --> - <property name="project.version" value="0.21"/> + <property name="project.version" value="0.23"/> <!-- The release version used for maven output. SNAPSHOT added via maven.version.suffix --> - <property name="project.version.maven" value="0.22"/> + <property name="project.version.maven" value="0.24"/> <property name="project.url" value="http://qpid.apache.org"/> <property name="project.groupid" value="org.apache.qpid"/> <property name="project.namever" value="${project.name}-${project.version}"/> Modified: qpid/branches/QPID-4659/qpid/java/common/src/main/java/common.bnd URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/common/src/main/java/common.bnd?rev=1461870&r1=1461869&r2=1461870&view=diff ============================================================================== --- qpid/branches/QPID-4659/qpid/java/common/src/main/java/common.bnd (original) +++ qpid/branches/QPID-4659/qpid/java/common/src/main/java/common.bnd Wed Mar 27 21:58:51 2013 @@ -17,7 +17,7 @@ # under the License. # -ver: 0.21.0 +ver: 0.23.0 Bundle-SymbolicName: qpid-common Bundle-Version: ${ver} Modified: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/management-common.bnd URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/management-common.bnd?rev=1461870&r1=1461869&r2=1461870&view=diff ============================================================================== --- qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/management-common.bnd (original) +++ qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/management-common.bnd Wed Mar 27 21:58:51 2013 @@ -17,7 +17,7 @@ # under the License. # -ver: 0.21.0 +ver: 0.23.0 Bundle-SymbolicName: qpid-management-common Bundle-Version: ${ver} Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1458037-1461856 Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1458037-1461856 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
