Author: rfeng
Date: Thu Jul 19 15:47:40 2007
New Revision: 557805
URL: http://svn.apache.org/viewvc?view=rev&rev=557805
Log:
Call XMLStreamReader.close() to release resources after the non-lazy loading
Modified:
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
Modified:
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java?view=diff&rev=557805&r1=557804&r2=557805
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
Thu Jul 19 15:47:40 2007
@@ -42,6 +42,7 @@
JAXBContext jaxbContext =
JAXBContextHelper.createJAXBContext(context, false);
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
Object result = unmarshaller.unmarshal(source);
+ source.close();
return
JAXBContextHelper.createReturnValue(context.getTargetDataType(), result);
} catch (Exception e) {
throw new TransformationException(e);
Modified:
incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java?view=diff&rev=557805&r1=557804&r2=557805
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
Thu Jul 19 15:47:40 2007
@@ -53,6 +53,7 @@
XMLStreamWriter jsonWriter = new BadgerFishXMLStreamWriter(writer);
XMLStreamSerializer serializer = new XMLStreamSerializer();
serializer.serialize(source, jsonWriter);
+ source.close();
return new JSONObject(writer.toString());
} catch (Exception e) {
throw new TransformationException(e);
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java?view=diff&rev=557805&r1=557804&r2=557805
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
Thu Jul 19 15:47:40 2007
@@ -43,7 +43,9 @@
while (source.getEventType() != XMLStreamConstants.START_ELEMENT
&& source.hasNext()) {
source.next();
}
- return streamHelper.loadObject(source);
+ DataObject target = streamHelper.loadObject(source);
+ source.close();
+ return target;
} catch (Exception e) {
throw new TransformationException(e);
}
Modified:
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java?view=diff&rev=557805&r1=557804&r2=557805
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
Thu Jul 19 15:47:40 2007
@@ -37,7 +37,9 @@
try {
HelperContext helperContext =
SDOContextHelper.getHelperContext(context);
XMLStreamHelper streamHelper =
SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
- return streamHelper.load(source);
+ XMLDocument target = streamHelper.load(source);
+ source.close();
+ return target;
} catch (Exception e) {
throw new TransformationException(e);
}
Modified:
incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java?view=diff&rev=557805&r1=557804&r2=557805
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-xmlbeans/src/main/java/org/apache/tuscany/sca/databinding/xmlbeans/XMLStreamReader2XmlObject.java
Thu Jul 19 15:47:40 2007
@@ -24,7 +24,6 @@
import org.apache.tuscany.sca.databinding.TransformationContext;
import org.apache.tuscany.sca.databinding.TransformationException;
import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
public class XMLStreamReader2XmlObject extends
BaseTransformer<XMLStreamReader, XmlObject> implements
PullTransformer<XMLStreamReader, XmlObject> {
@@ -32,8 +31,10 @@
public XmlObject transform(XMLStreamReader source, TransformationContext
context) {
try {
- return XmlObject.Factory.parse(source);
- } catch (XmlException e) {
+ XmlObject target = XmlObject.Factory.parse(source);
+ source.close();
+ return target;
+ } catch (Exception e) {
throw new TransformationException(e);
}
}
Modified:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java?view=diff&rev=557805&r1=557804&r2=557805
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
Thu Jul 19 15:47:40 2007
@@ -38,7 +38,9 @@
public Node transform(XMLStreamReader source, TransformationContext
context) {
try {
stax2sax.transform(source, pipe.getSink(), context);
- return pipe.getResult();
+ Node node = pipe.getResult();
+ source.close();
+ return node;
} catch (Exception e) {
throw new TransformationException(e);
}
Modified:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java?view=diff&rev=557805&r1=557804&r2=557805
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
Thu Jul 19 15:47:40 2007
@@ -62,6 +62,7 @@
StAX2SAXAdapter adapter = new StAX2SAXAdapter(false);
try {
adapter.parse(source, sink);
+ source.close();
} catch (Exception e) {
throw new TransformationException(e);
}
Modified:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java?view=diff&rev=557805&r1=557804&r2=557805
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
Thu Jul 19 15:47:40 2007
@@ -31,7 +31,9 @@
public String transform(XMLStreamReader source, TransformationContext
context) {
try {
- return StAXHelper.save(source);
+ String str = StAXHelper.save(source);
+ source.close();
+ return str;
} catch (XMLStreamException e) {
throw new TransformationException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
