cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1244722 - in /cxf/branches/2.4.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Date Wed, 15 Feb 2012 21:03:08 GMT
Author: ay
Date: Wed Feb 15 21:03:08 2012
New Revision: 1244722

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

................
  r1244717 | ay | 2012-02-15 21:56:25 +0100 (Wed, 15 Feb 2012) | 9 lines
  
  Merged revisions 1244697 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1244697 | ay | 2012-02-15 21:39:14 +0100 (Wed, 15 Feb 2012) | 1 line
    
    [CXF-4096] a robust in-only option with WS-A
  ........
................

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 (added)
+++ svn:mergeinfo Wed Feb 15 21:03:08 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.5.x-fixes:1244717
+/cxf/trunk:1244697

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=1244722&r1=1244721&r2=1244722&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
Wed Feb 15 21:03:08 2012
@@ -405,6 +405,7 @@ public final class ContextUtils {
                         MessageUtils.isTrue(inMessage.getContextualProperty(Message.ROBUST_ONEWAY));
                     
                     if (robust) {
+                        BindingOperationInfo boi = exchange.get(BindingOperationInfo.class);
                         // insert the executor in the exchange to fool the OneWayProcessorInterceptor
                         exchange.put(Executor.class, getExecutor(inMessage));
                         // pause dispatch on current thread and resume...
@@ -417,6 +418,8 @@ public final class ContextUtils {
                             faultObserver.onMessage(inMessage);
                             return;
                         }
+                        // restore the BOI for the partial response handling
+                        exchange.put(BindingOperationInfo.class, boi);
                     }
                     
                     // set up interceptor chains and send message



Mime
View raw message