From f5aa36ef9f092240f99cb64b83cc64b91544d638 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 17 Jun 2015 21:30:25 +0200
Subject: fix rest of resource leaks (#1351)

---
 .../keychain/operations/ImportExportOperation.java       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
index ffce2f39c..cdda42dae 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/ImportExportOperation.java
@@ -411,13 +411,17 @@ public class ImportExportOperation extends BaseOperation {
 
         try {
             OutputStream outStream = new FileOutputStream(outputFile);
-            ExportResult result = exportKeyRings(log, masterKeyIds, exportSecret, outStream);
-            if (result.cancelled()) {
-                //noinspection ResultOfMethodCallIgnored
-                new File(outputFile).delete();
+            try {
+                ExportResult result = exportKeyRings(log, masterKeyIds, exportSecret, outStream);
+                if (result.cancelled()) {
+                    //noinspection ResultOfMethodCallIgnored
+                    new File(outputFile).delete();
+                }
+                return result;
+            } finally {
+                outStream.close();
             }
-            return result;
-        } catch (FileNotFoundException e) {
+        } catch (IOException e) {
             log.add(LogType.MSG_EXPORT_ERROR_FOPEN, 1);
             return new ExportResult(ExportResult.RESULT_ERROR, log);
         }
-- 
cgit v1.2.3