You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/02/15 21:56:26 UTC

svn commit: r1244717 - in /cxf/branches/2.5.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java

Author: ay
Date: Wed Feb 15 20:56:25 2012
New Revision: 1244717

URL: http://svn.apache.org/viewvc?rev=1244717&view=rev
Log:
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.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1244697

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

Modified: cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1244717&r1=1244716&r2=1244717&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Wed Feb 15 20:56:25 2012
@@ -406,6 +406,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...
@@ -418,6 +419,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