You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/29 02:44:52 UTC
svn commit: r699930 -
/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
Author: jsdelfino
Date: Sun Sep 28 17:44:52 2008
New Revision: 699930
URL: http://svn.apache.org/viewvc?rev=699930&view=rev
Log:
Fix NPE in finally after earlier exception.
Modified:
tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
Modified: tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java?rev=699930&r1=699929&r2=699930&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java (original)
+++ tuscany/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java Sun Sep 28 17:44:52 2008
@@ -62,7 +62,9 @@
reader = source.getXMLStreamReaderWithoutCaching();
result = unmarshaller.unmarshal(reader, JAXBContextHelper.getJavaType(context.getTargetDataType()));
} finally {
- reader.close();
+ if (reader != null) {
+ reader.close();
+ }
JAXBContextHelper.releaseJAXBUnmarshaller(jaxbContext, unmarshaller);
}
return JAXBContextHelper.createReturnValue(jaxbContext, context.getTargetDataType(), result);