From 683d193327b49971098517758d6d3f79c5d94a4f Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 21 Jan 2016 14:34:46 +0000
Subject: coverity#1326456 Dereference null return value

and

coverity#1326455 Dereference null return value

Change-Id: I48f18483c82dafed6352434e98d5b49120fdcfc5
---
 .../java/ifc/configuration/backend/_XBackend.java  | 32 +++++++++-------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'qadevOOo')

diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java
index c55c4579a918..eb8a09cc65a3 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java
@@ -118,6 +118,9 @@ public class _XBackend extends MultiMethodTest {
         } catch (com.sun.star.container.NoSuchElementException e) {
             log.println("unexpected Exception " + e + " -- FAILED");
             res = false;
+        } catch (com.sun.star.uno.Exception e) {
+            log.println("unexpected Exception " + e + " -- FAILED");
+            res = false;
         }
 
         tRes.tested("getUpdateHandler()", res);
@@ -127,8 +130,7 @@ public class _XBackend extends MultiMethodTest {
         boolean res = true;
 
         try {
-            XStringSubstitution sts = createStringSubstitution(
-                                              tParam.getMSF());
+            XStringSubstitution sts = createStringSubstitution(tParam.getMSF());
             String ent = sts.getSubstituteVariableValue("$(inst)") +
                          "/share/registry";
             XLayer[] Layers = oObj.listLayers(
@@ -147,6 +149,9 @@ public class _XBackend extends MultiMethodTest {
         } catch (com.sun.star.container.NoSuchElementException e) {
             log.println("unexpected Exception " + e + " -- FAILED");
             res = false;
+        } catch (com.sun.star.uno.Exception e) {
+            log.println("unexpected Exception " + e + " -- FAILED");
+            res = false;
         }
 
         tRes.tested("listLayers()", res);
@@ -236,21 +241,10 @@ public class _XBackend extends MultiMethodTest {
         return res;
     }
 
-    public static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF) {
-        Object xPathSubst = null;
-
-        try {
-            xPathSubst = xMSF.createInstance(
-                                 "com.sun.star.util.PathSubstitution");
-        } catch (com.sun.star.uno.Exception e) {
-            e.printStackTrace();
-        }
-
-        if (xPathSubst != null) {
-            return UnoRuntime.queryInterface(
-                           XStringSubstitution.class, xPathSubst);
-        } else {
-            return null;
-        }
+    public static XStringSubstitution createStringSubstitution(XMultiServiceFactory xMSF) throws com.sun.star.uno.Exception
+    {
+        Object xPathSubst = xMSF.createInstance(
+                    "com.sun.star.util.PathSubstitution");
+        return UnoRuntime.queryInterface(XStringSubstitution.class, xPathSubst);
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3