Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 81729 invoked from network); 15 May 2008 14:49:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 May 2008 14:49:16 -0000 Received: (qmail 16346 invoked by uid 500); 15 May 2008 14:49:17 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 16294 invoked by uid 500); 15 May 2008 14:49:17 -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 16283 invoked by uid 99); 15 May 2008 14:49:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 May 2008 07:49:17 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 15 May 2008 14:48:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5D8A22388A00; Thu, 15 May 2008 07:48:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r656688 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: ActiveMQSession.java command/Message.java Date: Thu, 15 May 2008 14:48:52 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080515144852.5D8A22388A00@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Thu May 15 07:48:51 2008 New Revision: 656688 URL: http://svn.apache.org/viewvc?rev=656688&view=rev Log: Fix for http://issues.apache.org/activemq/browse/AMQ-1661 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java?rev=656688&r1=656687&r2=656688&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java Thu May 15 07:48:51 2008 @@ -1599,6 +1599,8 @@ msg.setMessageId(new MessageId(producer.getProducerInfo().getProducerId(), sequenceNumber)); message.setJMSMessageID(msg.getMessageId().toString()); } + //clear the brokerPath in case we are re-sending this message + msg.setBrokerPath(null); msg.setJMSDestination(destination); msg.setJMSDeliveryMode(deliveryMode); Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java?rev=656688&r1=656687&r2=656688&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/Message.java Thu May 15 07:48:51 2008 @@ -134,10 +134,7 @@ copy.brokerInTime = brokerInTime; copy.brokerOutTime = brokerOutTime; copy.memoryUsage=this.memoryUsage; - // copying the broker path breaks networks - if a consumer re-uses a - // consumed - // message and forwards it on - // copy.brokerPath = brokerPath; + copy.brokerPath = brokerPath; // lets not copy the following fields // copy.targetConsumerId = targetConsumerId;