svn commit: r1293420 - in /tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers: HeaderReferenceInterceptor.java HeaderServiceInterceptor.java

[jennthom]

Author: jennthom
Date: Fri Feb 24 21:16:02 2012
New Revision: 1293420

URL: http://svn.apache.org/viewvc?rev=1293420&view=rev
Log:
Back out changes for JIRA TUSCANY 4019. scaOperationName is being used to 
correlate non-persistent asynch responses. 

Modified:
    
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
    
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java?rev=1293420&r1=1293419&r2=1293420&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
 Fri Feb 24 21:16:02 2012
@@ -175,6 +175,15 @@ public class HeaderReferenceInterceptor 
                
                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 ) {

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java?rev=1293420&r1=1293419&r2=1293420&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderServiceInterceptor.java
 Fri Feb 24 21:16:02 2012
@@ -77,6 +77,8 @@ public class HeaderServiceInterceptor ex
             
             Operation operation = tuscanyMsg.getOperation();
             String operationName = operation.getName();
+            
+            responseMessageProcessor.setOperationName(operationName, jmsMsg);
 
             for (String propName : jmsBinding.getPropertyNames()) {
                 Object value = jmsBinding.getProperty(propName);