You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/08/05 09:43:39 UTC

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

Author: antelder
Date: Tue Aug  5 00:43:38 2008
New Revision: 682613

URL: http://svn.apache.org/viewvc?rev=682613&view=rev
Log:
Set correlation id on request, fix for void response

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=682613&r1=682612&r2=682613&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 Tue Aug  5 00:43:38 2008
@@ -227,7 +227,8 @@
                     return null;
                 } else {
                     Message replyMsg = receiveReply(session, replyToDest, requestMsg.getJMSMessageID());
-                    return ((Object[])responseMessageProcessor.extractPayloadFromJMSMessage(replyMsg))[0];
+                    Object[] response = (Object[])responseMessageProcessor.extractPayloadFromJMSMessage(replyMsg);
+                    return (response != null && response.length > 0) ? response[0] : null;
                 }
 
             } finally {
@@ -309,6 +310,10 @@
             }
         }
 
+        if (jmsBinding.getOperationJMSCorrelationId(operationName) != null) {
+            jmsMsg.setJMSCorrelationID(jmsBinding.getOperationJMSCorrelationId(operationName));
+        }
+
         if (jmsBinding.getOperationJMSPriority(operationName) != null) {
             jmsMsg.setJMSPriority(jmsBinding.getOperationJMSPriority(operationName));
         }