You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ch...@apache.org on 2006/02/14 18:31:04 UTC
svn commit: r377778 - in
/webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom:
SOAPFaultDetailImpl.java factory/SOAPLinkedListImplFactory.java
Author: chinthaka
Date: Tue Feb 14 09:31:02 2006
New Revision: 377778
URL: http://svn.apache.org/viewcvs?rev=377778&view=rev
Log:
Fixing some bugs in SOAPFaultDetail
Modified:
webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/SOAPFaultDetailImpl.java
webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/factory/SOAPLinkedListImplFactory.java
Modified: webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/SOAPFaultDetailImpl.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/SOAPFaultDetailImpl.java?rev=377778&r1=377777&r2=377778&view=diff
==============================================================================
--- webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/SOAPFaultDetailImpl.java (original)
+++ webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/SOAPFaultDetailImpl.java Tue Feb 14 09:31:02 2006
@@ -18,8 +18,9 @@
import org.apache.ws.commons.om.OMElement;
import org.apache.ws.commons.om.OMNamespace;
+import org.apache.ws.commons.om.OMNode;
import org.apache.ws.commons.om.OMXMLParserWrapper;
-import org.apache.ws.commons.om.impl.OMNodeEx;
+import org.apache.ws.commons.om.impl.llom.OMNodeImpl;
import org.apache.ws.commons.om.impl.llom.OMSerializerUtil;
import org.apache.ws.commons.om.impl.llom.serialize.StreamWriterToContentHandlerConverter;
import org.apache.ws.commons.soap.SOAP12Constants;
@@ -28,6 +29,7 @@
import org.apache.ws.commons.soap.SOAPProcessingException;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
import java.util.Iterator;
public abstract class SOAPFaultDetailImpl extends SOAPElement implements SOAPFaultDetail {
@@ -69,33 +71,30 @@
}
- if (!cache) {
- //No caching
- if (this.firstChild != null) {
- OMSerializerUtil.serializeStartpart(this, omOutput);
- ((OMNodeEx)firstChild).serializeAndConsume(omOutput);
- OMSerializerUtil.serializeEndpart(omOutput);
- } else if (!this.done) {
- if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, omOutput);
- } else {
- OMSerializerUtil.serializeStartpart(this, omOutput);
- builder.setCache(cache);
- builder.next();
- OMSerializerUtil.serializeEndpart(omOutput);
- }
- } else {
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
- }
- // do not serialise the siblings
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
+ if (this.getNamespace() != null) {
+ String prefix = this.getNamespace().getPrefix();
+ String nameSpaceName = this.getNamespace().getName();
+ writer.writeStartElement(prefix, SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
+ nameSpaceName);
+ } else {
+ writer.writeStartElement(
+ SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME);
+ }
+ OMSerializerUtil.serializeAttributes(this, omOutput);
+ OMSerializerUtil.serializeNamespaces(this, omOutput);
- } else {
- //Cached
- OMSerializerUtil.serializeNormal(this, omOutput, cache);
+ String text = this.getText();
+ writer.writeCharacters(text);
- // do not serialise the siblings
+ OMNode child = (OMNodeImpl) firstChild;
+ while (child != null && ((!(child instanceof OMElement)) || child.isComplete())) {
+ ((OMNodeImpl) child).serializeAndConsume(omOutput);
+ child = child.getNextOMSibling();
}
+
+ writer.writeEndElement();
}
Modified: webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/factory/SOAPLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/factory/SOAPLinkedListImplFactory.java?rev=377778&r1=377777&r2=377778&view=diff
==============================================================================
--- webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/factory/SOAPLinkedListImplFactory.java (original)
+++ webservices/commons/modules/axiom/src/org/apache/ws/commons/soap/impl/llom/factory/SOAPLinkedListImplFactory.java Tue Feb 14 09:31:02 2006
@@ -292,8 +292,8 @@
SOAPFaultReason reason = createSOAPFaultReason(fault);
SOAPFaultText faultText = createSOAPFaultText(reason);
- SOAPFaultNode faultNode = createSOAPFaultNode(fault);
- SOAPFaultRole faultRole = createSOAPFaultRole(fault);
+// SOAPFaultNode faultNode = createSOAPFaultNode(fault);
+// SOAPFaultRole faultRole = createSOAPFaultRole(fault);
SOAPFaultDetail faultDetail = createSOAPFaultDetail(fault);
return defaultEnvelope;