coverity#1326516 Resource leak on an exceptional path

Change-Id: I91cc5614fb0db76eabd46cbe7e39ae33227728b7
2016-03-04 10:13:12 +00:00
parent b08e200c3d
commit 1e83fab9b4
1 changed files with 9 additions and 5 deletions
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
@@ -186,10 +186,14 @@ public final class Driver {
                    merger.merge(convertedFile);
                    mergeIS.close();

-                    FileOutputStream fos = new FileOutputStream(mergeFile);
+                    FileOutputStream fos = null;
+                    try {
+                        fos = new FileOutputStream(mergeFile);
                        mergeDoc.write(fos);
                        fos.flush();
-                    fos.close();
+                    } finally {
+                        close(fos);
+                    }
                } catch (Exception mergeExcept) {
                    System.out.println("\nThere was an error in the merge");
                    mergeExcept.printStackTrace();