From 87cbe4483fffb1a105c62b0a0b8e0d85789a07df Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 24 Jan 2012 09:25:05 +0000 Subject: TUSCANY-4008: Apply patch from Jennifer A Thompson to fix JMS binding operationProperties 'selectedOperation' element not selecting the correct operation git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1235181 13f79535-47bb-0310-9956-ffa450edef68 --- .../binding/jms/wire/OperationPropertiesInterceptor.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'sca-java-2.x/trunk') 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; -- cgit v1.2.3