1 files changed, 8 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
index 682c9ee48c..e665e03795 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
@@ -57,11 +57,14 @@ public class OperationPropertiesInterceptor extends InterceptorAsyncImpl {
     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;