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 2010/10/01 19:52:06 UTC
svn commit: r1003594 - in /cxf/branches/2.2.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Author: dkulp
Date: Fri Oct 1 17:52:06 2010
New Revision: 1003594
URL: http://svn.apache.org/viewvc?rev=1003594&view=rev
Log:
Merged revisions 1003592 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1003592 | dkulp | 2010-10-01 13:46:04 -0400 (Fri, 01 Oct 2010) | 1 line
[CXF-2992] Use unique response map for each request
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1003594&r1=1003593&r2=1003594&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Fri Oct 1 17:52:06 2010
@@ -304,7 +304,7 @@ public class ClientImpl
Object[] params,
Exchange exchange) throws Exception {
Map<String, Object> context = new HashMap<String, Object>();
- Map<String, Object> resp = getResponseContext();
+ Map<String, Object> resp = new HashMap<String, Object>();
resp.clear();
Map<String, Object> req = new HashMap<String, Object>(getRequestContext());
context.put(RESPONSE_CONTEXT, resp);
@@ -594,6 +594,7 @@ public class ClientImpl
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("set responseContext to be" + resContext);
}
+ responseContext.put(Thread.currentThread(), resContext);
}
resList = inMsg.getContent(List.class);
}
@@ -741,7 +742,9 @@ public class ClientImpl
.getOutMessage()
.get(Message.INVOCATION_CONTEXT));
resCtx = CastUtils.cast((Map<?, ?>)resCtx.get(RESPONSE_CONTEXT));
-
+ if (resCtx != null) {
+ responseContext.put(Thread.currentThread(), resCtx);
+ }
try {
Object obj[] = processResult(message, message.getExchange(),
null, resCtx);