From a48d091fa5ccff19e225d7aab68ec7acfadfe26e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 11 Apr 2017 17:10:20 -0700 Subject: [PATCH] Ensured inputStream.copyTo() is automatically closed. --- .../main/kotlin/com/beust/kobalt/archive/MetaArchive.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/MetaArchive.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/MetaArchive.kt index 7ddc733d..8e45f4dd 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/MetaArchive.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/MetaArchive.kt @@ -4,10 +4,7 @@ import com.beust.kobalt.Glob import com.beust.kobalt.misc.KFiles import org.apache.commons.compress.archivers.ArchiveEntry import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream -import java.io.Closeable -import java.io.File -import java.io.FileInputStream -import java.io.FileOutputStream +import java.io.* import java.nio.file.Files import org.apache.commons.compress.archivers.zip.ZipFile as ApacheZipFile @@ -61,7 +58,9 @@ class MetaArchive(outputFile: File, val manifest: java.util.jar.Manifest?) : Clo private fun addEntry(entry: ArchiveEntry, inputStream: FileInputStream) { zos.putArchiveEntry(entry) - inputStream.copyTo(zos, 50 * 1024) + inputStream.use { ins -> + ins.copyTo(zos, 50 * 1024) + } zos.closeArchiveEntry() }