From 69fd971e684779bd7e500333a7c7d3814fffd111 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 19 Dec 2015 15:24:48 +0000
Subject: coverity#1326953 RV: Bad use of return value

and

coverity#1326954 RV: Bad use of return value
coverity#1326955 RV: Bad use of return value
coverity#1326956 RV: Bad use of return value
coverity#1326957 RV: Bad use of return value
coverity#1326958 RV: Bad use of return value
coverity#1326959 RV: Bad use of return value
coverity#1326960 RV: Bad use of return value
coverity#1326961 RV: Bad use of return value
coverity#1326962 RV: Bad use of return value

Change-Id: I02c2f7a5214e348f06a12b78a9400d8501b00e57
---
 qadevOOo/runner/helper/OfficeProvider.java | 30 ++++++++++++++++++------------
 qadevOOo/runner/util/db/DataSource.java    |  8 ++++++--
 2 files changed, 24 insertions(+), 14 deletions(-)

(limited to 'qadevOOo/runner')

diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index 6d03e5d5a031..62ac34f528d9 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -738,21 +738,27 @@ public class OfficeProvider implements AppProvider
         }
     }
 
-private void deleteFilesAndDirector(File file)
+    private void deleteFilesAndDirector(File file)
+    {
+        File f = file;
+        if(f.isDirectory())
         {
-            File f = file;
-            if(f.isDirectory())
+            File files[] = f.listFiles();
+            for(int i = 0; i < files.length; i++)
             {
-                File files[] = f.listFiles();
-                for(int i = 0; i < files.length; i++)
-                {
-                    deleteFilesAndDirector(files[i]);
-                }
-                f.delete();
+                deleteFilesAndDirector(files[i]);
             }
-            else if (f.isFile())
-            {
-                f.delete();
+            boolean bDeleteOk = f.delete();
+            if (!bDeleteOk) {
+                System.out.println("delete failed");
             }
         }
+        else if (f.isFile())
+        {
+            boolean bDeleteOk = f.delete();
+            if (!bDeleteOk) {
+                System.out.println("delete failed");
+            }
+        }
+    }
 }
diff --git a/qadevOOo/runner/util/db/DataSource.java b/qadevOOo/runner/util/db/DataSource.java
index e2fdcb9186de..b9f41c332f28 100644
--- a/qadevOOo/runner/util/db/DataSource.java
+++ b/qadevOOo/runner/util/db/DataSource.java
@@ -113,11 +113,15 @@ public class DataSource
             if ( docURL.length() == 0 )
             {
                 final java.io.File tempFile = java.io.File.createTempFile( _registrationName + "_", ".odb" );
-                if ( tempFile.exists() )
+                if ( tempFile.exists() ) {
                     // we did not really want to create that file, we just wanted its local name, but
                     // createTempFile actually creates it => throw it away
                     // (This is necessary since some JVM/platform combinations seem to actually lock the file)
-                    tempFile.delete();
+                    boolean bDeleteOk = tempFile.delete();
+                    if (!bDeleteOk) {
+                         System.out.println("delete failed");
+                    }
+                }
                 String localPart = tempFile.toURI().toURL().toString();
                 localPart = localPart.substring( localPart.lastIndexOf( '/' ) + 1 );
                 docURL = util.utils.getOfficeTemp( m_orb ) + localPart;
-- 
cgit