From commits-return-15662-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Mar 01 16:00:23 2011 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 41087 invoked from network); 1 Mar 2011 16:00:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Mar 2011 16:00:23 -0000 Received: (qmail 15290 invoked by uid 500); 1 Mar 2011 16:00:23 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 15112 invoked by uid 500); 1 Mar 2011 16:00:21 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 15101 invoked by uid 99); 1 Mar 2011 16:00:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 16:00:20 +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; Tue, 01 Mar 2011 16:00:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1B1B52388A3C; Tue, 1 Mar 2011 16:00:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075864 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java Date: Tue, 01 Mar 2011 16:00:00 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110301160000.1B1B52388A3C@eris.apache.org> Author: gtully Date: Tue Mar 1 15:59:59 2011 New Revision: 1075864 URL: http://svn.apache.org/viewvc?rev=1075864&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3193 - implement equals for indirect message ref, so remove from pendingdispatch will work on moveMessages Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java?rev=1075864&r1=1075863&r2=1075864&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java Tue Mar 1 15:59:59 2011 @@ -72,6 +72,17 @@ public class IndirectMessageReference im return "Message " + message.getMessageId() + " dropped=" + dropped + " acked=" + acked + " locked=" + (lockOwner != null); } + @Override + public boolean equals(Object obj) { + return this == obj || (obj instanceof IndirectMessageReference && + message.getMessageId().equals(((IndirectMessageReference)obj).getMessage().getMessageId())); + } + + @Override + public int hashCode() { + return message.hashCode(); + } + public void incrementRedeliveryCounter() { message.incrementRedeliveryCounter(); }