You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2008/02/14 04:55:29 UTC

svn commit: r627655 - in /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client: BasicMessageProducer_0_10.java message/AbstractJMSMessage.java

Author: rhs
Date: Wed Feb 13 19:55:28 2008
New Revision: 627655

URL: http://svn.apache.org/viewvc?rev=627655&view=rev
Log:
recompute internal 0-10 message for reused messages

Modified:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=627655&r1=627654&r2=627655&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java Wed Feb 13 19:55:28 2008
@@ -68,17 +68,11 @@
         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();

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?rev=627655&r1=627654&r2=627655&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java Wed Feb 13 19:55:28 2008
@@ -78,7 +78,7 @@
             {
                 if (_data != null)
                 {
-                    _010message.appendData(_data.buf());
+                    _010message.appendData(_data.buf().slice());
                 }
                 else
                 {