cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1366312 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Date Fri, 27 Jul 2012 08:53:51 GMT
Author: ay
Date: Fri Jul 27 08:53:50 2012
New Revision: 1366312

URL: http://svn.apache.org/viewvc?rev=1366312&view=rev
Log:
Merged revisions 1366308 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1366308 | ay | 2012-07-27 10:49:03 +0200 (Fri, 27 Jul 2012) | 1 line
  
  protect against a recursive reference in responseContext (for CXF-4437)
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java

Propchange: cxf/branches/2.6.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1366312&r1=1366311&r2=1366312&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Fri
Jul 27 08:53:50 2012
@@ -634,9 +634,8 @@ public class ClientImpl
         if (inMsg != null) {
             if (null != resContext) {
                 resContext.putAll(inMsg);
-                if (LOG.isLoggable(Level.FINE)) {
-                    LOG.fine("set responseContext to be" + resContext);
-                }
+                // remove the recursive reference if present
+                resContext.remove(Message.INVOCATION_CONTEXT);
                 responseContext.put(Thread.currentThread(), resContext);
             }
             resList = CastUtils.cast(inMsg.getContent(List.class));



Mime
View raw message