qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject svn commit: r1463215 - /qpid/branches/0.22/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Date Mon, 01 Apr 2013 17:34:23 GMT
Author: rajith
Date: Mon Apr  1 17:34:23 2013
New Revision: 1463215

URL: http://svn.apache.org/r1463215
Log:
QPID-3769 Added a check to see if the subject is equal.

(cherry picked from commit f08d757099b0c25a67353a06cd2c7706cbee701d)

Modified:
    qpid/branches/0.22/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java

Modified: qpid/branches/0.22/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=1463215&r1=1463214&r2=1463215&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
(original)
+++ qpid/branches/0.22/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Mon Apr  1 17:34:23 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
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message