You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by em...@apache.org on 2013/09/29 07:13:52 UTC

svn commit: r1527273 - in /cxf/branches/2.6.x-fixes: ./ rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java

Author: ema
Date: Sun Sep 29 05:13:52 2013
New Revision: 1527273

URL: http://svn.apache.org/r1527273
Log:
Merged revisions 1527272 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1527272 | ema | 2013-09-29 13:10:45 +0800 (Sun, 29 Sep 2013) | 9 lines
  
  Merged revisions 1527271 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1527271 | ema | 2013-09-29 13:06:21 +0800 (Sun, 29 Sep 2013) | 1 line
    
    [CXF-5307]:Add DecoupledFaultHandler for request-response message when decoupled fault is supported
  ........
................

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

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1527272
  Merged /cxf/trunk:r1527271

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

Modified: cxf/branches/2.6.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1527273&r1=1527272&r2=1527273&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Sun Sep 29 05:13:52 2013
@@ -152,7 +152,8 @@ public class MAPCodec extends AbstractSo
                     }
                 }
             }
-        } else if (MessageUtils.getContextualBoolean(message, DECOUPLED_FAULT_SUPPORT, false)) {
+        } 
+        if (MessageUtils.getContextualBoolean(message, DECOUPLED_FAULT_SUPPORT, false)) {
             new DecoupledFaultHandler().handleFault(message);
         }
     }