Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3584FF1D5 for ; Mon, 1 Apr 2013 17:34:46 +0000 (UTC) Received: (qmail 34606 invoked by uid 500); 1 Apr 2013 17:34:46 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 34525 invoked by uid 500); 1 Apr 2013 17:34:45 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 34507 invoked by uid 99); 1 Apr 2013 17:34:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 17:34:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 17:34:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D1FD623889BB; Mon, 1 Apr 2013 17:34:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@qpid.apache.org From: rajith@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130401173423.D1FD623889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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