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 2012/05/09 17:54:33 UTC
svn commit: r1336251 - in /cxf/branches/2.5.x-fixes: ./
common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
Author: sergeyb
Date: Wed May 9 15:54:33 2012
New Revision: 1336251
URL: http://svn.apache.org/viewvc?rev=1336251&view=rev
Log:
Merged revisions 1336247 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1336247 | sergeyb | 2012-05-09 16:48:33 +0100 (Wed, 09 May 2012) | 1 line
[CXF-4290] Fixing the cglib proxy and improving the test a bit
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1336247
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java?rev=1336251&r1=1336250&r2=1336251&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java (original)
+++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java Wed May 9 15:54:33 2012
@@ -57,6 +57,7 @@ class CglibProxyHelper extends ProxyHelp
}
if (superClass != null) {
Enhancer enhancer = new Enhancer();
+ enhancer.setClassLoader(loader);
enhancer.setSuperclass(superClass);
enhancer.setInterfaces(theInterfaces.toArray(new Class[]{}));
enhancer.setCallback(new MethodInterceptor() {
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java?rev=1336251&r1=1336250&r2=1336251&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBeanTest.java Wed May 9 15:54:33 2012
@@ -62,6 +62,7 @@ public class JAXRSClientFactoryBeanTest
bean.setClassLoader(loader);
BookStore client = (BookStore)bean.createWithValues(BookStore.class);
assertNotNull(client);
+ assertSame(client.getClass().getClassLoader(), loader);
// tricky to test the loader has been used correctly with Maven
// given that the system loader loads all the test classes