Author: dkulp
Date: Mon Oct 25 21:10:44 2010
New Revision: 1027271
URL: http://svn.apache.org/viewvc?rev=1027271&view=rev
Log:
Merged revisions 1027269 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1027269 | dkulp | 2010-10-25 17:07:59 -0400 (Mon, 25 Oct 2010) | 1 line
[CXF-2992] More fixes for thread safety around the response context
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Propchange: cxf/branches/2.3.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 25 21:10:44 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269
Modified:
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1027271&r1=1027270&r2=1027271&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Mon Oct 25 21:10:44 2010
@@ -411,7 +411,7 @@ public class ClientImpl
Endpoint endpoint = getEndpoint();
if (context == null) {
context = new HashMap<String, Object>();
- Map<String, Object> resp = getResponseContext();
+ Map<String, Object> resp = new HashMap<String, Object>();
resp.clear();
Map<String, Object> reqContext = new HashMap<String,
Object>(getRequestContext());
context.put(RESPONSE_CONTEXT, resp);