Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 972DF863B for ; Tue, 30 Aug 2011 15:56:28 +0000 (UTC) Received: (qmail 6254 invoked by uid 500); 30 Aug 2011 15:56:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 6193 invoked by uid 500); 30 Aug 2011 15:56:27 -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 6186 invoked by uid 99); 30 Aug 2011 15:56:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Aug 2011 15:56:27 +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; Tue, 30 Aug 2011 15:56:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6296F2388A02 for ; Tue, 30 Aug 2011 15:56:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1163269 - in /cxf/trunk/rt/frontend/jaxws/src: main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java Date: Tue, 30 Aug 2011 15:56:04 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110830155604.6296F2388A02@eris.apache.org> Author: dkulp Date: Tue Aug 30 15:56:03 2011 New Revision: 1163269 URL: http://svn.apache.org/viewvc?rev=1163269&view=rev Log: [CXF-3758] Some work to make sure the WSC threadlocal is really clear. Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java?rev=1163269&r1=1163268&r2=1163269&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java Tue Aug 30 15:56:03 2011 @@ -66,9 +66,10 @@ public class JAXWSMethodInvoker extends updateHeader(exchange, ctx); throw f; } finally { - addHandlerProperties(ctx, handlerScopedStuff); //clear the WebServiceContextImpl's ThreadLocal variable WebServiceContextImpl.clear(); + + addHandlerProperties(ctx, handlerScopedStuff); } return res; } Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java?rev=1163269&r1=1163268&r2=1163269&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java Tue Aug 30 15:56:03 2011 @@ -46,10 +46,6 @@ public class WebServiceContextImpl imple public WebServiceContextImpl() { } - public WebServiceContextImpl(MessageContext ctx) { - setMessageContext(ctx); - } - // Implementation of javax.xml.ws.WebServiceContext public final MessageContext getMessageContext() { @@ -123,7 +119,7 @@ public class WebServiceContextImpl imple } public static void clear() { - context.set(null); + context.remove(); } } Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java?rev=1163269&r1=1163268&r2=1163269&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java Tue Aug 30 15:56:03 2011 @@ -34,15 +34,7 @@ public class WebServiceContextImplTest e @After public void tearDown() { WebServiceContextImpl.clear(); - } - - @Test - public void testConstructor() { - MessageImpl msg = new MessageImpl(); - WrappedMessageContext msgCtx = new WrappedMessageContext(msg); - WebServiceContextImpl ctx = new WebServiceContextImpl(msgCtx); - assertSame(msgCtx, ctx.getMessageContext()); - } + } @Test public void testGetSetMessageContext() {