Author: dkulp Date: Mon Nov 22 18:35:23 2010 New Revision: 1037825 URL: http://svn.apache.org/viewvc?rev=1037825&view=rev Log: Merged revisions 1037804 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1037804 | dkulp | 2010-11-22 13:00:52 -0500 (Mon, 22 Nov 2010) | 9 lines Merged revisions 1037498 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1037498 | bimargulies | 2010-11-21 11:18:58 -0500 (Sun, 21 Nov 2010) | 1 line CXF-3143: don't leak proxies ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?rev=1037825&r1=1037824&r2=1037825&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java (original) +++ cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Mon Nov 22 18:35:23 2010 @@ -81,7 +81,11 @@ public final class SOAPBindingUtil { public static <T> T getProxy(Class<T> cls, Object obj) { InvocationHandler ih = new ExtensionInvocationHandler(obj); - Object proxy = Proxy.newProxyInstance(cls.getClassLoader(), new Class[] {cls}, ih); + /* + * If we put proxies into the loader of the proxied class, they'll just pile up. + */ + Object proxy = Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), + new Class[] {cls}, ih); return cls.cast(proxy); }
