From d9442b1398117ee1710a608a7c30d5e1a073a945 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 6 Feb 2016 20:46:09 +0000
Subject: coverity#1326516 Resource leak on an exceptional path

Change-Id: Ia46ec73bd3dcaef1ec0c9a977f3fc472d94ed390
---
 .../xmerge/java/org/openoffice/xmerge/test/Driver.java    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'xmerge/source')

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
index 7e970334d9b2..9d3ae7cb00a7 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
@@ -100,6 +100,15 @@ public final class Driver {
         }
     }
 
+    private static void close(FileOutputStream c) {
+        if (c == null) return;
+        try {
+            c.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * Gets a {@code Convert} object using the {@code ConverterFactory} and does
      * the conversion using this object.
@@ -153,15 +162,17 @@ public final class Driver {
                 while (docEnum.hasNext()) {
                     Document docOut      = (Document)docEnum.next();
                     String fileName      = docOut.getFileName();
+                    FileOutputStream fos = null;
                     try {
-                        FileOutputStream fos = new FileOutputStream(fileName);
+                        fos = new FileOutputStream(fileName);
                         docOut.write(fos);
                         fos.flush();
-                        fos.close();
                     } catch (Exception writeExcept) {
                         System.out.println("\nThere was an writing out file <" +
                             fileName + ">");
                         writeExcept.printStackTrace();
+                    } finally {
+                        close(fos);
                     }
                 }
             } else {
-- 
cgit