Author: scheu
Date: Fri Aug 10 13:11:10 2007
New Revision: 564742
URL: http://svn.apache.org/viewvc?view=rev&rev=564742
Log:
WSCOMMONS-222
Contributor:Rich Scheuerle
Restoring files
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/OMElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.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?view=diff&rev=564742&r1=564741&r2=564742
==============================================================================
---
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
Fri Aug 10 13:11:10 2007
@@ -729,53 +729,29 @@
}
public void serialize(OutputStream output) throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(output);
- try {
- serialize(xmlStreamWriter);
- } finally {
- xmlStreamWriter.close();
- }
+ serialize(StAXUtils.createXMLStreamWriter(output));
}
public void serialize(Writer writer) throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(writer);
- try {
- serialize(xmlStreamWriter);
- } finally {
- xmlStreamWriter.close();
- }
+ serialize(StAXUtils.createXMLStreamWriter(writer));
}
public void serializeAndConsume(OutputStream output)
throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(output);
- try {
- serializeAndConsume(xmlStreamWriter);
- } finally {
- xmlStreamWriter.close();
- }
+ serializeAndConsume(StAXUtils
+ .createXMLStreamWriter(output));
}
public void serializeAndConsume(Writer writer) throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(writer);
- try {
- serializeAndConsume(xmlStreamWriter);
- } finally {
- xmlStreamWriter.close();
- }
+ serializeAndConsume(StAXUtils
+ .createXMLStreamWriter(writer));
}
public void serialize(OutputStream output, OMOutputFormat format)
throws XMLStreamException {
MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
- try {
- internalSerialize(writer);
- writer.flush();
- } finally {
- if (format.isAutoCloseWriter()) {
- writer.close();
- }
- }
+ internalSerialize(writer);
+ writer.flush();
}
public void serialize(Writer writer2, OMOutputFormat format)
@@ -783,42 +759,24 @@
MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(StAXUtils
.createXMLStreamWriter(writer2));
writer.setOutputFormat(format);
- try {
- internalSerialize(writer);
- writer.flush();
- } finally {
- if (format.isAutoCloseWriter()) {
- writer.close();
- }
- }
+ internalSerialize(writer);
+ writer.flush();
}
public void serializeAndConsume(OutputStream output, OMOutputFormat format)
throws XMLStreamException {
MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
- try {
- internalSerializeAndConsume(writer);
- writer.flush();
- } finally {
- if (format.isAutoCloseWriter()) {
- writer.close();
- }
- }
+ internalSerializeAndConsume(writer);
+ writer.flush();
}
public void serializeAndConsume(Writer writer2, OMOutputFormat format)
throws XMLStreamException {
MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(StAXUtils
.createXMLStreamWriter(writer2));
- try {
- writer.setOutputFormat(format);
- internalSerializeAndConsume(writer);
- writer.flush();
- } finally {
- if (format.isAutoCloseWriter()) {
- writer.close();
- }
- }
+ writer.setOutputFormat(format);
+ internalSerializeAndConsume(writer);
+ writer.flush();
}
/** Returns the <code>OMFactory</code> that created this node */
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?view=diff&rev=564742&r1=564741&r2=564742
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Fri Aug 10 13:11:10 2007
@@ -901,12 +901,8 @@
public String toStringWithConsume() throws XMLStreamException {
StringWriter writer = new StringWriter();
XMLStreamWriter writer2 = StAXUtils.createXMLStreamWriter(writer);
- try {
- this.serializeAndConsume(writer2);
- writer2.flush();
- } finally {
- writer2.close();
- }
+ this.serializeAndConsume(writer2);
+ writer2.flush();
return writer.toString();
}
@@ -914,12 +910,8 @@
StringWriter writer = new StringWriter();
try {
XMLStreamWriter writer2 = StAXUtils.createXMLStreamWriter(writer);
- try {
- this.serialize(writer2);
- writer2.flush();
- } finally {
- writer2.close();
- }
+ this.serialize(writer2);
+ writer2.flush();
} catch (XMLStreamException e) {
throw new RuntimeException("Can not serialize OM Element " +
this.getLocalName(), e);
}
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?view=diff&rev=564742&r1=564741&r2=564742
==============================================================================
---
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
Fri Aug 10 13:11:10 2007
@@ -380,39 +380,19 @@
}
public void serialize(OutputStream output) throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(output);
- try {
- serialize(xmlStreamWriter);
- } finally {
- xmlStreamWriter.close();
- }
+ serialize(StAXUtils.createXMLStreamWriter(output));
}
public void serialize(Writer writer) throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(writer);
- try {
- serialize(xmlStreamWriter);
- } finally {
- xmlStreamWriter.close();
- }
+ serialize(StAXUtils.createXMLStreamWriter(writer));
}
public void serializeAndConsume(OutputStream output) throws
XMLStreamException {
- XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(output);
- try {
- serializeAndConsume(xmlStreamWriter);
- } finally {
- xmlStreamWriter.close();
- }
+ serializeAndConsume(StAXUtils.createXMLStreamWriter(output));
}
public void serializeAndConsume(Writer writer) throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter =
StAXUtils.createXMLStreamWriter(writer);
- try {
- serializeAndConsume(xmlStreamWriter);
- } finally {
- xmlStreamWriter.close();
- }
+ serializeAndConsume(StAXUtils.createXMLStreamWriter(writer));
}
public void serialize(OutputStream output, OMOutputFormat format) throws
XMLStreamException {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?view=diff&rev=564742&r1=564741&r2=564742
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Fri Aug 10 13:11:10 2007
@@ -689,12 +689,10 @@
if (isDebugEnabled) {
log.debug("serialize " + getPrintableName() + " to output stream");
}
- OMOutputFormat format = new OMOutputFormat();
- format.setAutoCloseWriter(true);
if (isExpanded()) {
- super.serializeAndConsume(output, format);
+ super.serializeAndConsume(output, new OMOutputFormat());
} else {
- dataSource.serialize(output, format);
+ dataSource.serialize(output, new OMOutputFormat());
}
}
@@ -708,9 +706,7 @@
if (isExpanded()) {
super.serializeAndConsume(writer);
} else {
- OMOutputFormat format = new OMOutputFormat();
- format.setAutoCloseWriter(true);
- dataSource.serialize(writer, format);
+ dataSource.serialize(writer, new OMOutputFormat());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
