svn commit: r1516208 - /cxf/trunk/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java

[dkulp]

Author: dkulp
Date: Wed Aug 21 16:43:57 2013
New Revision: 1516208

URL: http://svn.apache.org/r1516208
Log:
[CXF-5225] Provide the Endpoint so conduit selectors can make a complete 
decision

Modified:
    cxf/trunk/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java

Modified: cxf/trunk/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1516208&r1=1516207&r2=1516208&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java 
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Wed 
Aug 21 16:43:57 2013
@@ -814,7 +814,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);
     }
 
@@ -874,10 +874,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);