summaryrefslogtreecommitdiff
path: root/java/client
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2008-02-14 03:55:28 +0000
committerRafael H. Schloming <rhs@apache.org>2008-02-14 03:55:28 +0000
commit299cb36acd8d12611f5b0daa28f03ffd004f0500 (patch)
tree66d5e5ebf0b61a77567500593ab5c992500f24a5 /java/client
parent3cfec3f03590f86c53ef32e8d1d30c0d2eec964d (diff)
downloadqpid-python-299cb36acd8d12611f5b0daa28f03ffd004f0500.tar.gz
recompute internal 0-10 message for reused messages
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@627655 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java16
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java2
2 files changed, 6 insertions, 12 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
index a31bfe9df1..42c1d687cb 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
+++ b/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/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index 7eb56acb27..e3ca6b5de1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/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
{