You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2008/05/15 16:48:52 UTC
svn commit: r656688 - in
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq:
ActiveMQSession.java command/Message.java
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;