You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/09/26 23:10:34 UTC
svn commit: r1526689 -
/cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
Author: dkulp
Date: Thu Sep 26 21:10:33 2013
New Revision: 1526689
URL: http://svn.apache.org/r1526689
Log:
Merged revisions 1526681 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1526681 | dkulp | 2013-09-26 17:05:57 -0400 (Thu, 26 Sep 2013) | 11 lines
Merged revisions 1526678 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1526678 | dkulp | 2013-09-26 17:00:30 -0400 (Thu, 26 Sep 2013) | 3 lines
[CXF-5294] Write all the detail elements out.
Patch from Jens Granseuer applied
........
........
Modified:
cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
Modified: cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java?rev=1526689&r1=1526688&r2=1526689&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java (original)
+++ cxf/branches/2.6.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java Thu Sep 26 21:10:33 2013
@@ -23,12 +23,12 @@ import java.util.ResourceBundle;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.apache.cxf.binding.xml.XMLConstants;
import org.apache.cxf.binding.xml.XMLFault;
import org.apache.cxf.common.i18n.BundleUtils;
-import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.NSStack;
import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
import org.apache.cxf.interceptor.Fault;
@@ -74,10 +74,15 @@ public class XMLFaultOutInterceptor exte
// call StaxUtils to write Fault detail.
if (xmlFault.getDetail() != null) {
+ Element detail = xmlFault.getDetail();
StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_DETAIL,
XMLConstants.NS_XML_FORMAT);
- StaxUtils.writeNode(DOMUtils.getChild(xmlFault.getDetail(), Node.ELEMENT_NODE),
- writer, false);
+
+ Node node = detail.getFirstChild();
+ while (node != null) {
+ StaxUtils.writeNode(node, writer, false);
+ node = node.getNextSibling();
+ }
writer.writeEndElement();
}
// fault root