Author: dkulp Date: Tue Aug 30 19:42:56 2011 New Revision: 1163356 URL: http://svn.apache.org/viewvc?rev=1163356&view=rev Log: Merged revisions 1163270 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1163270 | dkulp | 2011-08-30 12:05:49 -0400 (Tue, 30 Aug 2011) | 9 lines Merged revisions 1163269 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1163269 | dkulp | 2011-08-30 11:56:03 -0400 (Tue, 30 Aug 2011) | 1 line [CXF-3758] Some work to make sure the WSC threadlocal is really clear. ........ ................ 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 cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.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=1163356&r1=1163355&r2=1163356&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 Tue Aug 30 19:42:56 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/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java?rev=1163356&r1=1163355&r2=1163356&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java Tue Aug 30 19:42:56 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/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java?rev=1163356&r1=1163355&r2=1163356&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java Tue Aug 30 19:42:56 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() {
