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 sc...@apache.org on 2008/08/07 20:43:56 UTC
svn commit: r683673 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
Author: scheu
Date: Thu Aug 7 11:43:55 2008
New Revision: 683673
URL: http://svn.apache.org/viewvc?rev=683673&view=rev
Log:
WSCOMMONS-368
Contributor:Rich Scheuerle
Remove excessive wrappering of MTOMXMLStreamWriter. The inner OMFormat values were being overridden by the outer default OMFormat values. In addition, less wrappering shorts the call paths.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?rev=683673&r1=683672&r2=683673&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java Thu Aug 7 11:43:55 2008
@@ -488,14 +488,18 @@
}
public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
- MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(xmlWriter);
+ MTOMXMLStreamWriter writer = xmlWriter instanceof MTOMXMLStreamWriter ?
+ (MTOMXMLStreamWriter) xmlWriter :
+ new MTOMXMLStreamWriter(xmlWriter);
internalSerialize(writer);
writer.flush();
}
public void serializeAndConsume(XMLStreamWriter xmlWriter)
throws XMLStreamException {
- MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(xmlWriter);
+ MTOMXMLStreamWriter writer = xmlWriter instanceof MTOMXMLStreamWriter ?
+ (MTOMXMLStreamWriter) xmlWriter :
+ new MTOMXMLStreamWriter(xmlWriter);
internalSerializeAndConsume(writer);
writer.flush();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java?rev=683673&r1=683672&r2=683673&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java Thu Aug 7 11:43:55 2008
@@ -377,7 +377,11 @@
*
*/
public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
- MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(xmlWriter);
+
+ // If the input xmlWriter is not an MTOMXMLStreamWriter, then wrapper it
+ MTOMXMLStreamWriter writer = xmlWriter instanceof MTOMXMLStreamWriter ?
+ (MTOMXMLStreamWriter) xmlWriter :
+ new MTOMXMLStreamWriter(xmlWriter);
internalSerialize(writer);
writer.flush();
}
@@ -390,7 +394,10 @@
*
*/
public void serializeAndConsume(XMLStreamWriter xmlWriter) throws XMLStreamException {
- MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(xmlWriter);
+ // If the input xmlWriter is not an MTOMXMLStreamWriter, then wrapper it
+ MTOMXMLStreamWriter writer = xmlWriter instanceof MTOMXMLStreamWriter ?
+ (MTOMXMLStreamWriter) xmlWriter :
+ new MTOMXMLStreamWriter(xmlWriter);
internalSerializeAndConsume(writer);
writer.flush();
}