cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1521165 - in /cxf/trunk/rt: frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ frontend/simple/src/main/java/org/apache/cxf/frontend/ rs/client/src/main/java/org/apache/cxf/jaxrs/client/
Date Mon, 09 Sep 2013 15:53:50 GMT
Author: dkulp
Date: Mon Sep  9 15:53:50 2013
New Revision: 1521165

URL: http://svn.apache.org/r1521165
Log:
Remove an now unneeded check in JaxWsProxyFactoryBean and move the service interface to the
end to try and make the classloaders more reliable.

Modified:
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
    cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
    cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=1521165&r1=1521164&r2=1521165&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
Mon Sep  9 15:53:50 2013
@@ -119,13 +119,7 @@ public class JaxWsProxyFactoryBean exten
     @Override
     protected Class<?>[] getImplementingClasses() {
         Class<?> cls = getClientFactoryBean().getServiceClass();
-        Class<?> ret[] = new Class[] {cls, BindingProvider.class, Closeable.class,
Client.class};
-        try {
-            Proxy.getProxyClass(cls.getClassLoader(), ret);
-        } catch (Throwable t) {
-            ret = new Class[] {cls};
-        }
-        return ret;
+        return new Class[] {BindingProvider.class, Closeable.class, Client.class, cls};
     }
     
     /**

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=1521165&r1=1521164&r2=1521165&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
Mon Sep  9 15:53:50 2013
@@ -190,7 +190,7 @@ public class ClientProxyFactoryBean exte
 
     protected Class<?>[] getImplementingClasses() {
         Class<?> cls = clientFactoryBean.getServiceClass();
-        return new Class[] {cls, Closeable.class, Client.class};
+        return new Class[] {Closeable.class, Client.class, cls};
     }
 
     protected ClientProxy clientClientProxy(Client c) {

Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java?rev=1521165&r1=1521164&r2=1521165&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
(original)
+++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
Mon Sep  9 15:53:50 2013
@@ -337,7 +337,7 @@ public final class JAXRSClientFactory {
     static <T> T createProxy(Class<T> cls, ClassLoader loader, InvocationHandler
handler) {
         
         return cls.cast(ProxyHelper.getProxy(loader == null ? cls.getClassLoader() : loader,

-                                             new Class[]{cls, Client.class}, 
+                                             new Class[]{Client.class, cls}, 
                                              handler));
     }
     

Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java?rev=1521165&r1=1521164&r2=1521165&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
(original)
+++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
Mon Sep  9 15:53:50 2013
@@ -308,7 +308,7 @@ public class JAXRSClientFactoryBean exte
             initClient(proxyImpl, ep, actualState == null);    
             
             ClassLoader theLoader = proxyLoader == null ? cri.getServiceClass().getClassLoader()
: proxyLoader;
-            Class<?>[] ifaces = new Class[]{cri.getServiceClass(), Client.class, InvocationHandlerAware.class};
+            Class<?>[] ifaces = new Class[]{Client.class, InvocationHandlerAware.class,
cri.getServiceClass()};
             Client actualClient = (Client)ProxyHelper.getProxy(theLoader, ifaces, proxyImpl);
             notifyLifecycleManager(actualClient);
             this.getServiceFactory().sendEvent(FactoryBeanListener.Event.CLIENT_CREATED,
actualClient, ep);



Mime
View raw message