Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 94567 invoked from network); 16 Mar 2011 19:14:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Mar 2011 19:14:13 -0000 Received: (qmail 80859 invoked by uid 500); 16 Mar 2011 19:14:13 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 80804 invoked by uid 500); 16 Mar 2011 19:14:13 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 80797 invoked by uid 99); 16 Mar 2011 19:14:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Mar 2011 19:14:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Mar 2011 19:14:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD0F82388962; Wed, 16 Mar 2011 19:13:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1082265 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java Date: Wed, 16 Mar 2011 19:13:50 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110316191350.CD0F82388962@eris.apache.org> Author: dkulp Date: Wed Mar 16 19:13:50 2011 New Revision: 1082265 URL: http://svn.apache.org/viewvc?rev=1082265&view=rev Log: Merged revisions 1082261 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1082261 | dkulp | 2011-03-16 15:03:29 -0400 (Wed, 16 Mar 2011) | 1 line [CXF-3406] Restore handler props in finally block ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java Propchange: cxf/branches/2.3.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java?rev=1082265&r1=1082264&r2=1082265&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java Wed Mar 16 19:13:50 2011 @@ -59,7 +59,6 @@ public class JAXWSMethodInvoker extends params = Collections.singletonList(null); } res = CastUtils.cast((List)super.invoke(exchange, serviceObject, m, params)); - addHandlerProperties(ctx, handlerScopedStuff); //update the webservice response context updateWebServiceContext(exchange, ctx); } catch (Fault f) { @@ -67,6 +66,7 @@ public class JAXWSMethodInvoker extends updateHeader(exchange, ctx); throw f; } finally { + addHandlerProperties(ctx, handlerScopedStuff); //clear the WebServiceContextImpl's ThreadLocal variable WebServiceContextImpl.clear(); }