You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/08/31 04:13:14 UTC

svn commit: r1163470 - in /cxf/trunk/rt: core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Author: dkulp
Date: Wed Aug 31 02:13:13 2011
New Revision: 1163470

URL: http://svn.apache.org/viewvc?rev=1163470&view=rev
Log:
[CXF-3780] Fix problem of DynamicClientFactory not honoring https
settings

Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1163470&r1=1163469&r2=1163470&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Wed Aug 31 02:13:13 2011
@@ -171,12 +171,11 @@ public class ClientImpl
     /**
      * Create a Client that uses a specific EndpointImpl.
      * @param bus
-     * @param wsdlUrl
      * @param service
      * @param port
      * @param endpointImplFactory
      */
-    public ClientImpl(Bus bus, URL wsdlUrl, Service svc, QName port,
+    public ClientImpl(Bus bus, Service svc, QName port,
                       EndpointImplFactory endpointImplFactory) {
         this.bus = bus;
         outFaultObserver = new ClientOutFaultObserver(bus);

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1163470&r1=1163469&r2=1163470&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Wed Aug 31 02:13:13 2011
@@ -256,15 +256,14 @@ public class DynamicClientFactory {
         if (classLoader == null) {
             classLoader = Thread.currentThread().getContextClassLoader();
         }
-        URL u = composeUrl(wsdlUrl);
-        LOG.log(Level.FINE, "Creating client from URL " + u.toString());
+        LOG.log(Level.FINE, "Creating client from WSDL " + wsdlUrl);
 
         WSDLServiceFactory sf = (service == null)
             ? (new WSDLServiceFactory(bus, wsdlUrl)) : (new WSDLServiceFactory(bus, wsdlUrl, service));
         sf.setAllowElementRefs(allowRefs);
         Service svc = sf.create();
 
-        ClientImpl client = new ClientImpl(bus, u, svc, port,
+        ClientImpl client = new ClientImpl(bus, svc, port,
                                            getEndpointImplFactory());
 
         //all SI's should have the same schemas