Updated for handling headers and jmstype

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

2 files changed, 8 insertions, 7 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 f9381f76f4..454c74b9fd 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
@@ -99,6 +99,11 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer
         BasicContentHeaderProperties contentHeaderProperties = message.getContentHeaderProperties();
         // set the application properties
         qpidityMessage.getMessageProperties().setContentType(contentHeaderProperties.getContentType().toString());
+        AMQShortString type = contentHeaderProperties.getType();
+        if( type != null )
+        {
+            qpidityMessage.getMessageProperties().setType( type.toString());
+        }
         qpidityMessage.getMessageProperties().setMessageId(message.getJMSMessageID()) ;
         AMQShortString correlationID = contentHeaderProperties.getCorrelationId();
         if( correlationID != null )
@@ -121,8 +126,7 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer
                     .setReplyTo(new ReplyTo(dest.getExchangeName().toString(), dest.getRoutingKey().toString()));
         }
          //JMS_QPID_DESTTYPE   is always set but useles so this is a temporary fix
-        // TODO remove second test
-        if (contentHeaderProperties.getHeaders() != null && contentHeaderProperties.getHeaders().size() > 1)
+        if (contentHeaderProperties.getHeaders() != null)
         {
             qpidityMessage.getMessageProperties().setApplicationHeaders(FiledTableSupport.convertToMap(contentHeaderProperties.getHeaders()));
 
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
index e037c3ed3e..0df4661b25 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
@@ -131,17 +131,14 @@ public abstract class AbstractJMSMessageFactory implements MessageFactory
         {
             props.setEncoding(encoding);
         }
-        props.setExpiration(devprop.getExpiration());
-        // todo update when fieldtable is used props.setHeaders(mprop.getApplicationHeaders());
+        props.setExpiration(devprop.getExpiration());        
         props.setMessageId(mprop.getMessageId());
         props.setPriority((byte) devprop.getPriority());
         props.setReplyTo(replyToURL);
         props.setTimestamp(devprop.getTimestamp());
         props.setType(mprop.getType());
         props.setUserId(mprop.getUserId());
-
-        props.setHeaders(FiledTableSupport.convertToFieldTable(mprop.getApplicationHeaders()));
-
+        props.setHeaders(FiledTableSupport.convertToFieldTable(mprop.getApplicationHeaders()));        
         return createMessage(messageNbr, data, exchange, routingKey, props);
     }