use try-with-resource

Marcus Linke · Marcus Linke · commit d8d394630d1b · 2015-07-30T21:05:12.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java b/src/main/java/com/github/dockerjava/core/CompressArchiveUtil.java
@@ -18,9 +18,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
             throws IOException {
         File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");
         tarFile.deleteOnExit();
-        TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(
-                new BufferedOutputStream(new FileOutputStream(tarFile))));
-        try {
+        try(TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(
+                new BufferedOutputStream(new FileOutputStream(tarFile))))) {
             tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
             for (File file : files) {
                 TarArchiveEntry tarEntry = new TarArchiveEntry(file);
@@ -39,8 +38,6 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi
                 }
                 tos.closeArchiveEntry();
             }
-        } finally {
-            tos.close();
         }
 
         return tarFile;

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi`
`18`	`18`	`throws IOException {`
`19`	`19`	`File tarFile = new File(FileUtils.getTempDirectoryPath(), archiveNameWithOutExtension + ".tar");`
`20`	`20`	`tarFile.deleteOnExit();`
`21`		`- TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(`
`22`		`- new BufferedOutputStream(new FileOutputStream(tarFile))));`
`23`		`- try {`
	`21`	`+ try(TarArchiveOutputStream tos = new TarArchiveOutputStream(new GZIPOutputStream(`
	`22`	`+ new BufferedOutputStream(new FileOutputStream(tarFile))))) {`
`24`	`23`	`tos.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);`
`25`	`24`	`for (File file : files) {`
`26`	`25`	`TarArchiveEntry tarEntry = new TarArchiveEntry(file);`
`@@ -39,8 +38,6 @@ public static File archiveTARFiles(File base, Iterable<File> files, String archi`
`39`	`38`	`}`
`40`	`39`	`tos.closeArchiveEntry();`
`41`	`40`	`}`
`42`		`- } finally {`
`43`		`- tos.close();`
`44`	`41`	`}`
`45`	`42`
`46`	`43`	`return tarFile;`