Added original message update

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@585944 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 5 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 e43fef5c94..a50c34ba51 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
@@ -66,15 +66,10 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer
     {
         message.prepareForSending();
         org.apache.qpidity.api.Message qpidityMessage = new ByteBufferMessage();
-        // set the payload
-
         if(_logger.isDebugEnabled())
         {
             _logger.debug("Message Props: " + message.toString());
         }
-
-        //System.out.println("Message Props" + message.toString());
-
         try
         {
             if (message.getData() != null)
@@ -143,6 +138,14 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer
                 _logger.debug(key + "=" + qpidityMessage.getMessageProperties().getApplicationHeaders().get(key));
             }
         }
+        if(_logger.isDebugEnabled() )
+        {
+            _logger.debug("Updating original message");
+        }
+        origMessage.setJMSPriority(qpidityMessage.getDeliveryProperties().getPriority());
+        origMessage.setJMSTimestamp(qpidityMessage.getDeliveryProperties().getTimestamp());
+        origMessage.setJMSExpiration(qpidityMessage.getDeliveryProperties().getExpiration());
+        origMessage.setJMSMessageID(message.getJMSMessageID());
         // send the message
         try
         {