You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2009/06/17 17:44:41 UTC
svn commit: r785683 - in /cxf/branches/2.2.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
Author: sergeyb
Date: Wed Jun 17 15:44:41 2009
New Revision: 785683
URL: http://svn.apache.org/viewvc?rev=785683&view=rev
Log:
Merged revisions 785651 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r785651 | sergeyb | 2009-06-17 16:12:40 +0100 (Wed, 17 Jun 2009) | 1 line
JAXRS : use context loader in case initial proxy creation fails
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 17 15:44:41 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784183,784893,784895,785279-785282,785468,785624
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784183,784893,784895,785279-785282,785468,785624,785651
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 17 15:44:41 2009
@@ -1 +1 @@
-/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784183,784893-785620,785622-785624
+/cxf/trunk:1-782619,782728-782730,783097,783294,783396,784059,784181-784183,784893-785620,785622-785624,785651
Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java?rev=785683&r1=785682&r2=785683&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java (original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java Wed Jun 17 15:44:41 2009
@@ -133,10 +133,17 @@
varValues);
initClient(proxyImpl, ep);
- return (Client)ProxyHelper.getProxy(cri.getServiceClass().getClassLoader(),
+ try {
+ return (Client)ProxyHelper.getProxy(cri.getServiceClass().getClassLoader(),
new Class[]{cri.getServiceClass(), Client.class,
InvocationHandlerAware.class},
proxyImpl);
+ } catch (Exception ex) {
+ return (Client)ProxyHelper.getProxy(Thread.currentThread().getContextClassLoader(),
+ new Class[]{cri.getServiceClass(), Client.class,
+ InvocationHandlerAware.class},
+ proxyImpl);
+ }
} catch (Exception ex) {
throw new WebApplicationException();
}