QPID-3769 Added a check to see if the subject is equal.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1461324 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 0 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 6ca2988186..fc7762e77d 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -653,6 +653,17 @@ public abstract class AMQDestination implements Destination, Referenceable
             {
                 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 implements Destination, Referenceable
         if (_destSyntax == DestSyntax.ADDR)
         {
             result = 29 * _addressType + _name.hashCode();
+            if (_subject != null)
+            {
+                result = 29 * result + _subject.hashCode();
+            }
         }
         else
         {