cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1393148 - /cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
Date Tue, 02 Oct 2012 20:09:46 GMT
Author: dkulp
Date: Tue Oct  2 20:09:46 2012
New Revision: 1393148

URL: http://svn.apache.org/viewvc?rev=1393148&view=rev
Log:
Merged revisions 1393138 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1393138 | dkulp | 2012-10-02 15:44:54 -0400 (Tue, 02 Oct 2012) | 19 lines

  Merged revisions 1393108 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

  ........
    r1393108 | dkulp | 2012-10-02 15:09:29 -0400 (Tue, 02 Oct 2012) | 11 lines

    Merged revisions 1393094 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1393094 | dkulp | 2012-10-02 14:50:15 -0400 (Tue, 02 Oct 2012) | 3 lines

      [CXF-4535] Fix bug with soap:fault child elements output in wrong order
      Patch from Gary Gregory applied

    ........

  ........

........

Modified:
    cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java

Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java?rev=1393148&r1=1393147&r2=1393148&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
Tue Oct  2 20:09:46 2012
@@ -97,6 +97,12 @@ public class Soap11FaultOutInterceptor e
                 writer.writeEndElement();
                 prepareStackTrace(message, fault);
     
+                if (fault.getRole() != null) {
+                    writer.writeStartElement("faultactor");
+                    writer.writeCharacters(fault.getRole());
+                    writer.writeEndElement();
+                }
+    
                 if (fault.hasDetails()) {
                     Element detail = fault.getDetail();
                     writer.writeStartElement("detail");
@@ -111,12 +117,6 @@ public class Soap11FaultOutInterceptor e
                     writer.writeEndElement();
                 }
     
-                if (fault.getRole() != null) {
-                    writer.writeStartElement("faultactor");
-                    writer.writeCharacters(fault.getRole());
-                    writer.writeEndElement();
-                }
-    
                 // Fault
                 writer.writeEndElement();
             } catch (Exception xe) {



Mime
View raw message