cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1295476 - in /cxf/branches/2.4.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Date Thu, 01 Mar 2012 08:53:53 GMT
Author: ay
Date: Thu Mar  1 08:53:53 2012
New Revision: 1295476

URL: http://svn.apache.org/viewvc?rev=1295476&view=rev
Log:
Merged revisions 1295470 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1295470 | ay | 2012-03-01 09:44:37 +0100 (Thu, 01 Mar 2012) | 9 lines
  
  Merged revisions 1295466 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1295466 | ay | 2012-03-01 09:30:00 +0100 (Thu, 01 Mar 2012) | 1 line
    
    [CXF4096] mark partialMessage as the output message after the robust invocation completes
  ........
................

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 08:53:53 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1295052
-/cxf/trunk:1295026
+/cxf/branches/2.5.x-fixes:1295052,1295470
+/cxf/trunk:1295026,1295466

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

Modified: cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1295476&r1=1295475&r2=1295476&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Thu Mar  1 08:53:53 2012
@@ -396,7 +396,6 @@ public final class ContextUtils {
                 if (reference == null) {
                     reference = ContextUtils.getNoneEndpointReference();
                 }
-                exchange.setOutMessage(partialResponse);
                 Conduit backChannel = target.getBackChannel(inMessage,
                                                             partialResponse,
                                                             reference);
@@ -427,6 +426,7 @@ public final class ContextUtils {
                         fullResponse != null
                         ? fullResponse.getInterceptorChain()
                         : OutgoingChainInterceptor.getOutInterceptorChain(exchange);
+                    exchange.setOutMessage(partialResponse);                    
                     partialResponse.setInterceptorChain(chain);
                     exchange.put(ConduitSelector.class,
                                  new PreexistingConduitSelector(backChannel,



Mime
View raw message