svn commit: r677286 - /tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java

[antelder]

Author: antelder
Date: Wed Jul 16 06:41:03 2008
New Revision: 677286

URL: http://svn.apache.org/viewvc?rev=677286&view=rev
Log:
Adjust JMS header processing

Modified:
    
tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java

Modified: 
tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java?rev=677286&r1=677285&r2=677286&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
 (original)
+++ 
tuscany/java/sca/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingInvoker.java
 Wed Jul 16 06:41:03 2008
@@ -257,9 +257,6 @@
 
         Message requestMsg = 
requestMessageProcessor.insertPayloadIntoJMSMessage(session, 
tuscanyMsg.getBody());
 
-        requestMsg.setJMSDeliveryMode(jmsBinding.getDeliveryMode());
-        requestMsg.setJMSPriority(jmsBinding.getPriority());
-
         setHeaders(tuscanyMsg, requestMsg);
 
         requestMessageProcessor.setOperationName(operationName, requestMsg);
@@ -295,9 +292,18 @@
     }
 
     protected void setHeaders(org.apache.tuscany.sca.invocation.Message 
tuscanyMsg, Message jmsMsg) throws JMSException {
-        if (hasCallback()) {
 
-            ReferenceParameters parameters = 
tuscanyMsg.getFrom().getReferenceParameters();
+        jmsMsg.setJMSDeliveryMode(jmsBinding.getDeliveryMode());
+        jmsMsg.setJMSPriority(jmsBinding.getPriority());
+
+        ReferenceParameters parameters = 
tuscanyMsg.getFrom().getReferenceParameters();
+
+        Object conversationID = parameters.getConversationID();
+        if (conversationID != null) {
+            
jmsMsg.setStringProperty(JMSBindingConstants.CONVERSATION_ID_PROPERTY, 
conversationID.toString());
+        }
+
+        if (hasCallback()) {
 
             if (parameters.getCallbackID() != null) {
                 
jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_ID_PROPERTY, 
parameters.getCallbackID().toString());
@@ -307,12 +313,6 @@
             if (callbackDestName != null) {
                 
jmsMsg.setStringProperty(JMSBindingConstants.CALLBACK_Q_PROPERTY, 
callbackDestName);
             }
-            
-            Object conversationID = parameters.getConversationID();
-            if (conversationID != null) {
-                
jmsMsg.setStringProperty(JMSBindingConstants.CONVERSATION_ID_PROPERTY, 
conversationID.toString());
-            }
-
         }
     }