Return-Path: X-Original-To: apmail-tuscany-commits-archive@www.apache.org Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C293F9AFA for ; Tue, 24 Jan 2012 09:25:33 +0000 (UTC) Received: (qmail 25293 invoked by uid 500); 24 Jan 2012 09:25:33 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 25273 invoked by uid 500); 24 Jan 2012 09:25:28 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 25265 invoked by uid 99); 24 Jan 2012 09:25:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jan 2012 09:25:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jan 2012 09:25:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F211D238890D for ; Tue, 24 Jan 2012 09:25:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 24 Jan 2012 09:25:05 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120124092505.F211D238890D@eris.apache.org> 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;