Author: ffang Date: Mon Oct 15 08:26:41 2012 New Revision: 1398213 URL: http://svn.apache.org/viewvc?rev=1398213&view=rev Log: Merged revisions 1398211 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1398211 | ffang | 2012-10-15 16:19:27 +0800 (一, 15 10 2012) | 16 lines Merged revisions 1398209 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ................ r1398209 | ffang | 2012-10-15 16:10:19 +0800 (一, 15 10 2012) | 9 lines Merged revisions 1398207 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1398207 | ffang | 2012-10-15 16:01:45 +0800 (一, 15 10 2012) | 1 line [CXF-4562]Soap Fault fields precedence is incorrect for soap12 ........ ................ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.5.x-fixes:r1398211 Merged /cxf/trunk:r1398207 Merged /cxf/branches/2.6.x-fixes:r1398209 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.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/Soap12FaultOutInterceptor.java?rev=1398213&r1=1398212&r2=1398213&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java (original) +++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java Mon Oct 15 08:26:41 2012 @@ -113,6 +113,12 @@ public class Soap12FaultOutInterceptor e writer.writeEndElement(); writer.writeEndElement(); + if (fault.getRole() != null) { + writer.writeStartElement(defaultPrefix, "Role", ns); + writer.writeCharacters(fault.getRole()); + writer.writeEndElement(); + } + prepareStackTrace(message, fault); if (fault.hasDetails()) { @@ -129,12 +135,6 @@ public class Soap12FaultOutInterceptor e writer.writeEndElement(); } - if (fault.getRole() != null) { - writer.writeStartElement(defaultPrefix, "Role", ns); - writer.writeCharacters(fault.getRole()); - writer.writeEndElement(); - } - // Fault writer.writeEndElement(); } catch (Exception xe) {
