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);
