You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/05/11 05:01:31 UTC
svn commit: r1101732 - in /cxf/branches/2.3.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
Author: ffang
Date: Wed May 11 03:01:31 2011
New Revision: 1101732
URL: http://svn.apache.org/viewvc?rev=1101732&view=rev
Log:
Merged revisions 1101727 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1101727 | ffang | 2011-05-11 10:14:59 +0800 (δΈ‰, 11 5 2011) | 1 line
[CXF-3503]revert set TCCL on AbstractInvoker
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java?rev=1101732&r1=1101731&r2=1101732&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java Wed May 11 03:01:31 2011
@@ -80,9 +80,7 @@ public abstract class AbstractInvoker im
protected Object invoke(Exchange exchange, final Object serviceObject, Method m, List<Object> params) {
Object res;
- ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
try {
- Thread.currentThread().setContextClassLoader(serviceObject.getClass().getClassLoader());
Object[] paramArray = new Object[]{};
if (params != null) {
paramArray = params.toArray();
@@ -133,9 +131,7 @@ public abstract class AbstractInvoker im
checkSuspendedInvocation(exchange, serviceObject, m, params, e);
exchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(e, m, params, false);
- } finally {
- Thread.currentThread().setContextClassLoader(oldCL);
- }
+ }
}
protected void checkSuspendedInvocation(Exchange exchange,