Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for http://issues.apache.org/activemq/browse/AMQ-1661 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@656688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2008-05-15 14:48:51 +00:00
parent 049ce286c7
commit 8b33c1c640
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
View File

@ -1599,6 +1599,8 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta
msg.setMessageId(new MessageId(producer.getProducerInfo().getProducerId(), sequenceNumber)); msg.setMessageId(new MessageId(producer.getProducerInfo().getProducerId(), sequenceNumber));
message.setJMSMessageID(msg.getMessageId().toString()); message.setJMSMessageID(msg.getMessageId().toString());
} }
//clear the brokerPath in case we are re-sending this message
msg.setBrokerPath(null);
msg.setJMSDestination(destination); msg.setJMSDestination(destination);
msg.setJMSDeliveryMode(deliveryMode); msg.setJMSDeliveryMode(deliveryMode);

5
activemq-core/src/main/java/org/apache/activemq/command/Message.java
View File

@ -134,10 +134,7 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
copy.brokerInTime = brokerInTime; copy.brokerInTime = brokerInTime;
copy.brokerOutTime = brokerOutTime; copy.brokerOutTime = brokerOutTime;
copy.memoryUsage=this.memoryUsage; copy.memoryUsage=this.memoryUsage;
// copying the broker path breaks networks - if a consumer re-uses a copy.brokerPath = brokerPath;
// consumed
// message and forwards it on
// copy.brokerPath = brokerPath;
// lets not copy the following fields // lets not copy the following fields
// copy.targetConsumerId = targetConsumerId; // copy.targetConsumerId = targetConsumerId;