summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/binding-jms-runtime/src
diff options
context:
space:
mode:
authorjennthom <jennthom@13f79535-47bb-0310-9956-ffa450edef68>2012-02-24 21:16:02 +0000
committerjennthom <jennthom@13f79535-47bb-0310-9956-ffa450edef68>2012-02-24 21:16:02 +0000
commitedc083d8056557814691d49d45b56f8244558bae (patch)
tree6967c9092b69456f3a9cdd899010fde51558c4a5 /sca-java-2.x/trunk/modules/binding-jms-runtime/src
parent6512c20e5ef0261436522fea93c4fa31a0fc0183 (diff)
Back out changes for JIRA TUSCANY 4019. scaOperationName is being used to correlate non-persistent asynch responses.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1293420 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-jms-runtime/src')
-rw-r--r--sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java9
-rw-r--r--sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java2
2 files changed, 11 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
index 5c84d665ca..87c6ddd08b 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
@@ -175,6 +175,15 @@ public class HeaderReferenceInterceptor extends InterceptorAsyncImpl {
javax.jms.Message responseMsg = msg.getBody();
try {
+ // Operation name...
+ String operationName = responseMsg.getStringProperty("scaOperationName");
+ for( Operation op : operations ) {
+ if( operationName.equals(op.getName())) {
+ msg.setOperation(op);
+ break;
+ } // end if
+ } // end for
+
// Relates to header...
String relatesTo = responseMsg.getStringProperty("RELATES_TO");
if( relatesTo != null ) {
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java
index 5bc9b03032..6f1c6ed10e 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java
@@ -77,6 +77,8 @@ public class HeaderServiceInterceptor extends InterceptorAsyncImpl {
Operation operation = tuscanyMsg.getOperation();
String operationName = operation.getName();
+
+ responseMessageProcessor.setOperationName(operationName, jmsMsg);
for (String propName : jmsBinding.getPropertyNames()) {
Object value = jmsBinding.getProperty(propName);