Author: richard.opalka(a)jboss.com Date: 2009-03-20 18:29:03 -0400 (Fri, 20 Mar 2009) New Revision: 9647 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java Log: [JBWS-2577] sync with CXF 2.2 code base Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-03-20 22:04:20 UTC (rev 9646) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-03-20 22:29:03 UTC (rev 9647) @@ -98,14 +98,21 @@ WebServiceContextImpl.setMessageContext(ctx); - Object retObj = _invokeInternal(exchange, o, ctx); + Object retObj = null; + try + { + retObj = _invokeInternal(exchange, o, ctx); - addHandlerProperties(ctx, handlerScopedStuff); + addHandlerProperties(ctx, handlerScopedStuff); - //update the webservice response context - updateWebServiceContext(exchange, ctx); - //clear the WebServiceContextImpl's ThreadLocal variable - WebServiceContextImpl.clear(); + //update the webservice response context + updateWebServiceContext(exchange, ctx); + } + finally + { + //clear the WebServiceContextImpl's ThreadLocal variable + WebServiceContextImpl.clear(); + } return new MessageContentsList(retObj); }