Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 3CF10F679 for ; Wed, 21 Aug 2013 16:50:47 +0000 (UTC) Received: (qmail 24151 invoked by uid 500); 21 Aug 2013 16:50:46 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 24094 invoked by uid 500); 21 Aug 2013 16:50:46 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 24079 invoked by uid 99); 21 Aug 2013 16:50:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Aug 2013 16:50:46 +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; Wed, 21 Aug 2013 16:50:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7AC6D23889BB; Wed, 21 Aug 2013 16:50:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1516216 - /cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Date: Wed, 21 Aug 2013 16:50:23 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130821165023.7AC6D23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Aug 21 16:50:23 2013 New Revision: 1516216 URL: http://svn.apache.org/r1516216 Log: Merged revisions 1516211 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1516211 | dkulp | 2013-08-21 12:47:02 -0400 (Wed, 21 Aug 2013) | 10 lines Merged revisions 1516208 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1516208 | dkulp | 2013-08-21 12:43:57 -0400 (Wed, 21 Aug 2013) | 2 lines [CXF-5225] Provide the Endpoint so conduit selectors can make a complete decision ........ ........ Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1516216&r1=1516215&r2=1516216&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Wed Aug 21 16:50:23 2013 @@ -877,7 +877,7 @@ public class ClientImpl Message message = new MessageImpl(); Exchange exchange = new ExchangeImpl(); message.setExchange(exchange); - setExchangeProperties(exchange, null, null); + setExchangeProperties(exchange, getEndpoint(), null); return getConduitSelector().selectConduit(message); } @@ -937,10 +937,11 @@ public class ClientImpl exchange.put(Client.class, this); exchange.put(Bus.class, bus); - if (endpoint != null && boi != null) { - + if (endpoint != null) { EndpointInfo endpointInfo = endpoint.getEndpointInfo(); - exchange.put(Message.WSDL_OPERATION, boi.getName()); + if (boi != null) { + exchange.put(Message.WSDL_OPERATION, boi.getName()); + } QName serviceQName = endpointInfo.getService().getName(); exchange.put(Message.WSDL_SERVICE, serviceQName);