From 7e6696672c416453f1daf796fef1890603c14b17 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 16 Feb 2016 09:32:23 +0000
Subject: coverity#1326280 Explicit null dereferenced

Change-Id: I68b88accb5518292af0b3c3418609c93371bf9cf
---
 .../xml/xslt/DocumentDeserializerImpl.java         | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'xmerge')

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
index a7b54636cc86..72b65453029b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
@@ -88,17 +88,19 @@ public final class DocumentDeserializerImpl
         while (enumerate.hasNext()) {
             docOut = (DOMDocument) enumerate.next();
         }
-        try {
-            domDoc = docOut.getContentDOM();
-            baos = transform(domDoc);
-            sxwDoc.initContentDOM();
-            DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-            dFactory.setNamespaceAware(true);
-            DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-            sxwDoc.setContentDOM(dBuilder.parse(new ByteArrayInputStream(baos.toByteArray())));
-
-        } catch (Exception e) {
-            System.out.println("The following error occurred:" + e);
+        if (docOut != null) {
+            try {
+                domDoc = docOut.getContentDOM();
+                baos = transform(domDoc);
+                sxwDoc.initContentDOM();
+                DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
+                dFactory.setNamespaceAware(true);
+                DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
+                sxwDoc.setContentDOM(dBuilder.parse(new ByteArrayInputStream(baos.toByteArray())));
+
+            } catch (Exception e) {
+                System.out.println("The following error occurred:" + e);
+            }
         }
         return sxwDoc;
     }
-- 
cgit