cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1366314 - in /cxf/branches/2.5.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Date Fri, 27 Jul 2012 09:11:04 GMT
Author: ay
Date: Fri Jul 27 09:11:03 2012
New Revision: 1366314

URL: http://svn.apache.org/viewvc?rev=1366314&view=rev
Log:
Merged revisions 1366312 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1366312 | ay | 2012-07-27 10:53:50 +0200 (Fri, 27 Jul 2012) | 9 lines
  
  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.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java

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

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

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1366314&r1=1366313&r2=1366314&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Fri Jul 27 09:11:03 2012
@@ -635,9 +635,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 = inMsg.getContent(List.class);



Mime
View raw message