From a25c6a2e6e776808d123c60d3551aea69d19c335 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 29 Sep 2008 00:44:52 +0000
Subject: Fix NPE in finally after earlier exception.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@699930 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'branches/sca-equinox/modules')

diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
index 827a1684bc..3753fd9d64 100644
--- a/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
+++ b/branches/sca-equinox/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
@@ -62,7 +62,9 @@ public class OMElement2JAXB extends BaseTransformer<OMElement, Object> implement
                         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);
-- 
cgit v1.2.3