Author: dkulp
Date: Thu Oct 15 16:12:04 2009
New Revision: 825545
URL: http://svn.apache.org/viewvc?rev=825545&view=rev
Log:
Merged revisions 825532 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r825532 | dkulp | 2009-10-15 11:50:11 -0400 (Thu, 15 Oct 2009) | 1 line
[CXF-2473] Close XMLStreamReader in StaxDataBinding
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java?rev=825545&r1=825544&r2=825545&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
Thu Oct 15 16:12:04 2009
@@ -120,7 +120,9 @@
public void write(Object obj, XMLStreamWriter writer) {
try {
if (obj instanceof XMLStreamReader) {
- StaxUtils.copy((XMLStreamReader) obj, writer);
+ XMLStreamReader xmlStreamReader = (XMLStreamReader) obj;
+ StaxUtils.copy(xmlStreamReader, writer);
+ xmlStreamReader.close();
} else if (obj instanceof XMLStreamWriterCallback) {
((XMLStreamWriterCallback) obj).write(writer);
} else {
