You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/08/31 14:25:38 UTC
svn commit: r1163604 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
Author: dkulp
Date: Wed Aug 31 12:25:38 2011
New Revision: 1163604
URL: http://svn.apache.org/viewvc?rev=1163604&view=rev
Log:
Merged revisions 1163603 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1163603 | dkulp | 2011-08-31 08:24:31 -0400 (Wed, 31 Aug 2011) | 2 lines
Restore contructor as it makes using it for mocks easier, but make it
not touch the thread local.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 12:25:38 2011
@@ -1 +1 @@
-/cxf/trunk:1163593
+/cxf/trunk:1163593,1163603
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java?rev=1163604&r1=1163603&r2=1163604&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WebServiceContextImpl.java Wed Aug 31 12:25:38 2011
@@ -43,13 +43,19 @@ public class WebServiceContextImpl imple
private static ThreadLocal<MessageContext> context = new ThreadLocal<MessageContext>();
+ private final MessageContext localCtx;
+
public WebServiceContextImpl() {
+ localCtx = null;
+ }
+
+ public WebServiceContextImpl(MessageContext c) {
+ localCtx = c;
}
// Implementation of javax.xml.ws.WebServiceContext
-
public final MessageContext getMessageContext() {
- return context.get();
+ return localCtx == null ? context.get() : localCtx;
}
public final Principal getUserPrincipal() {