svn commit: r1235181 - /tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java

[antelder]

Author: antelder
Date: Tue Jan 24 09:25:05 2012
New Revision: 1235181

URL: http://svn.apache.org/viewvc?rev=1235181&view=rev
Log:
TUSCANY-4008: Apply patch from Jennifer A Thompson to fix JMS binding 
operationProperties 'selectedOperation' element not selecting the correct 
operation

Modified:
    
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.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/wire/OperationPropertiesInterceptor.java?rev=1235181&r1=1235180&r2=1235181&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
 Tue Jan 24 09:25:05 2012
@@ -57,11 +57,14 @@ public class OperationPropertiesIntercep
     public Message invokeRequest(Message msg) {           
         //  TODO - could probably optimize this better 
         String operationName = msg.getOperation().getName();
-        String operationNameOverride = 
jmsBinding.getNativeOperationName(operationName);
-        for (Operation op : serviceOperations) {
-            if (op.getName().equals(operationNameOverride)) {
-                msg.setOperation(op);
-                break;
+        String operationNameOverride = 
jmsBinding.getOpNameFromNativeOperationName(operationName);
+        
+        if (operationNameOverride != null) {
+            for (Operation op : serviceOperations) {
+                if (op.getName().equals(operationNameOverride)) {
+                    msg.setOperation(op);
+                    break;
+                }
             }
         }
         return msg;