Skip to content

fix(abg): fix file handle leak in jar creation #1616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2024
Merged

fix(abg): fix file handle leak in jar creation #1616

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 4 additions & 27 deletions ...nding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/ZipUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ internal fun OutputStream.createZipFile(contents: Path) =
zipFile(file.toFile(), zipOutputStream)
}
}
zipOutputStream.flush()
}

/**
Expand Down Expand Up @@ -60,17 +59,8 @@ private fun zipDirectory(
lastAccessTime = FileTime.fromMillis(0)
}
zos.putNextEntry(zipEntry)
val bis =
BufferedInputStream(
FileInputStream(file),
)
var bytesRead: Long = 0
val bytesIn = ByteArray(BUFFER_SIZE)
var read: Int
while ((bis.read(bytesIn).also { read = it }) != -1) {
zos.write(bytesIn, 0, read)
bytesRead += read.toLong()
}
BufferedInputStream(FileInputStream(file))
.use { it.copyTo(zos) }
zos.closeEntry()
}
}
Expand All @@ -96,20 +86,7 @@ private fun zipFile(
lastAccessTime = FileTime.fromMillis(0)
}
zos.putNextEntry(zipEntry)
val bis =
BufferedInputStream(
FileInputStream(
file,
),
)
var bytesRead: Long = 0
val bytesIn = ByteArray(BUFFER_SIZE)
var read: Int
while ((bis.read(bytesIn).also { read = it }) != -1) {
zos.write(bytesIn, 0, read)
bytesRead += read.toLong()
}
BufferedInputStream(FileInputStream(file))
.use { it.copyTo(zos) }
zos.closeEntry()
}

private const val BUFFER_SIZE = 8192
Loading