diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2008-02-14 03:55:28 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2008-02-14 03:55:28 +0000 |
| commit | 85f022740bcfec0349074b0118eaa2b9baa955ef (patch) | |
| tree | d503e0b8737077c254108dbfd24a149da964288c /qpid | |
| parent | 8ac4011c539208d38c35178d9127408a227a4614 (diff) | |
| download | qpid-python-85f022740bcfec0349074b0118eaa2b9baa955ef.tar.gz | |
recompute internal 0-10 message for reused messages
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@627655 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java | 16 | ||||
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java | 2 |
2 files changed, 6 insertions, 12 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java index a31bfe9df1..42c1d687cb 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java @@ -68,17 +68,11 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer if (message.get010Message() == null) { message.set010Message(new ByteBufferMessage()); - if (message.getData() == null) - { - try - { - message.get010Message().appendData(ByteBuffer.allocate(0)); - } - catch (IOException e) - { - throw new JMSException(e.getMessage()); - } - } + } + // force a rebuild of the 0-10 message if data has changed + if (message.getData() == null) + { + message.dataChanged(); } DeliveryProperties deliveryProp = message.get010Message().getDeliveryProperties(); diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java index 7eb56acb27..e3ca6b5de1 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java @@ -78,7 +78,7 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach { if (_data != null) { - _010message.appendData(_data.buf()); + _010message.appendData(_data.buf().slice()); } else { |