Merge pull request #861 from igor-suhorukov/master

Avoid resource leak

h2/src/main/org/h2/command/dml/BackupCommand.java

@@ -64,7 +64,7 @@ public class BackupCommand extends Prepared {
             }
             String name = db.getName();
             name = FileUtils.getName(name);
-            OutputStream zip = FileUtils.newOutputStream(fileName, false);
+            try (OutputStream zip = FileUtils.newOutputStream(fileName, false)) {
                 ZipOutputStream out = new ZipOutputStream(zip);
                 db.flush();
                 if (db.getPageStore() != null) {
@@ -97,7 +97,7 @@ public class BackupCommand extends Prepared {
                     }
                 }
                 out.close();
-            zip.close();
+            }
         } catch (IOException e) {
             throw DbException.convertIOException(e, fileName);
         }

h2/src/main/org/h2/tools/Backup.java

@@ -128,7 +128,7 @@ public class Backup extends Tool {
         OutputStream fileOut = null;
         try {
             fileOut = FileUtils.newOutputStream(zipFileName, false);
-            ZipOutputStream zipOut = new ZipOutputStream(fileOut);
+            try (ZipOutputStream zipOut = new ZipOutputStream(fileOut)) {
                 String base = "";
                 for (String fileName : list) {
                     if (allFiles ||
@@ -168,7 +168,7 @@ public class Backup extends Tool {
                         out.println("Processed: " + fileName);
                     }
                 }
-            zipOut.close();
+            }
         } catch (IOException e) {
             throw DbException.convertIOException(e, zipFileName);
         } finally {

h2/src/main/org/h2/tools/ChangeFileEncryption.java

@@ -220,20 +220,11 @@ public class ChangeFileEncryption extends Tool {
         if (FileUtils.isDirectory(fileName)) {
             return;
         }
-        FileChannel fileIn = FilePath.get(fileName).open("r");
-        FileChannel fileOut = null;
         String temp = directory + "/temp.db";
-        try {
-            if (decryptKey != null) {
-                fileIn = new FilePathEncrypt.FileEncrypt(fileName, decryptKey, fileIn);
-            }
-            InputStream inStream = new FileChannelInputStream(fileIn, true);
+        try (FileChannel fileIn = getFileChannel(fileName, "r", decryptKey)){
+            try(InputStream inStream = new FileChannelInputStream(fileIn, true)) {
                 FileUtils.delete(temp);
-            fileOut = FilePath.get(temp).open("rw");
-            if (encryptKey != null) {
-                fileOut = new FilePathEncrypt.FileEncrypt(temp, encryptKey, fileOut);
-            }
-            OutputStream outStream = new FileChannelOutputStream(fileOut, true);
+                try (OutputStream outStream = new FileChannelOutputStream(getFileChannel(temp, "rw", encryptKey), true)) {
                     byte[] buffer = new byte[4 * 1024];
                     long remaining = fileIn.size();
                     long total = remaining;
@@ -248,18 +239,21 @@ public class ChangeFileEncryption extends Tool {
                         outStream.write(buffer, 0, len);
                         remaining -= len;
                     }
-            inStream.close();
-            outStream.close();
-        } finally {
-            fileIn.close();
-            if (fileOut != null) {
-                fileOut.close();
+                }
             }
         }
         FileUtils.delete(fileName);
         FileUtils.move(temp, fileName);
     }
 
+    private FileChannel getFileChannel(String fileName, String r, byte[] decryptKey) throws IOException {
+        FileChannel fileIn = FilePath.get(fileName).open(r);
+        if (decryptKey != null) {
+            fileIn = new FilePathEncrypt.FileEncrypt(fileName, decryptKey, fileIn);
+        }
+        return fileIn;
+    }
+
     private void copy(String fileName, FileStore in, byte[] key, boolean quiet) {
         if (FileUtils.isDirectory(fileName)) {
             return;

h2/src/main/org/h2/tools/Restore.java

@@ -155,7 +155,7 @@ public class Restore extends Tool {
                 originalDbLen = originalDbName.length();
             }
             in = FileUtils.newInputStream(zipFileName);
-            ZipInputStream zipIn = new ZipInputStream(in);
+            try (ZipInputStream zipIn = new ZipInputStream(in)) {
                 while (true) {
                     ZipEntry entry = zipIn.getNextEntry();
                     if (entry == null) {
@@ -189,7 +189,7 @@ public class Restore extends Tool {
                     zipIn.closeEntry();
                 }
                 zipIn.closeEntry();
-            zipIn.close();
+            }
         } catch (IOException e) {
             throw DbException.convertIOException(e, zipFileName);
         } finally {

h2/src/main/org/h2/util/Profiler.java

@@ -167,11 +167,8 @@ public class Profiler implements Runnable {
                     continue;
                 }
                 String file = arg;
-                Reader reader;
-                LineNumberReader r;
-                reader = new InputStreamReader(
-                        new FileInputStream(file), "CP1252");
-                r = new LineNumberReader(reader);
+                try (Reader reader = new InputStreamReader(new FileInputStream(file), "CP1252")) {
+                    LineNumberReader r = new LineNumberReader(reader);
                     while (true) {
                         String line = r.readLine();
                         if (line == null) {
@@ -180,12 +177,11 @@ public class Profiler implements Runnable {
                             threadDumps++;
                         }
                     }
-                reader.close();
-                reader = new InputStreamReader(
-                        new FileInputStream(file), "CP1252");
-                r = new LineNumberReader(reader);
+                }
+                try (Reader reader = new InputStreamReader(new FileInputStream(file), "CP1252")) {
+                    LineNumberReader r = new LineNumberReader(reader);
                     processList(readStackTrace(r));
-                reader.close();
+                }
             }
             System.out.println(getTopTraces(5));
         } catch (IOException e) {

h2/src/main/org/h2/util/SortedProperties.java

@@ -112,7 +112,7 @@ public class SortedProperties extends Properties {
         } catch (Exception e) {
             throw new IOException(e.toString(), e);
         }
-        PrintWriter writer = new PrintWriter(new BufferedWriter(w));
+        try (PrintWriter writer = new PrintWriter(new BufferedWriter(w))) {
             while (true) {
                 String line = r.readLine();
                 if (line == null) {
@@ -122,7 +122,7 @@ public class SortedProperties extends Properties {
                     writer.print(line + "\n");
                 }
             }
-        writer.close();
+        }
     }
 
     /**