You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sc...@apache.org on 2008/09/17 21:03:23 UTC
svn commit: r696398 -
/tuscany/branches/sca-java-1.3.2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
Author: scottkurz
Date: Wed Sep 17 12:03:23 2008
New Revision: 696398
URL: http://svn.apache.org/viewvc?rev=696398&view=rev
Log:
Fix NPE in finally after earlier exception.
Modified:
tuscany/branches/sca-java-1.3.2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
Modified: tuscany/branches/sca-java-1.3.2/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-java-1.3.2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java?rev=696398&r1=696397&r2=696398&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3.2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java (original)
+++ tuscany/branches/sca-java-1.3.2/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java Wed Sep 17 12:03:23 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);