Skip to content

fix: prevent FileOutputStream leak in CollectionCSVManager #1187

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
maheshkumargangula merged 1 commit into from
Feb 27, 2026
Merged

fix: prevent FileOutputStream leak in CollectionCSVManager #1187

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
10 changes: 9 additions & 1 deletion ...on-csv-actors/src/main/scala/org.sunbird/collectioncsv/manager/CollectionCSVManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,19 @@ object CollectionCSVManager extends CollectionInputFileReader {
val maxAllowedContentSize = Platform.getInteger(CollectionTOCConstants.SUNBIRD_TOC_MAX_FIRST_LEVEL_UNITS,30)

val csvFile: File = new File(collectionTocFileName)
var fos: FileOutputStream = null
var out: OutputStreamWriter = null
var csvPrinter: CSVPrinter = null
try{
deleteQuietly(csvFile)
TelemetryManager.info("CollectionCSVManager:createFileAndStore -> Creating file for CSV at Location: " + csvFile.getAbsolutePath)
touch(csvFile)

out = new OutputStreamWriter(new FileOutputStream(csvFile), StandardCharsets.UTF_8)
// Assign FileOutputStream to its own variable before passing it to
// OutputStreamWriter so the finally block can close fos independently
// if the OutputStreamWriter constructor throws.
fos = new FileOutputStream(csvFile)
out = new OutputStreamWriter(fos, StandardCharsets.UTF_8)
out.write(ByteOrderMark.UTF_BOM)

val csvFormat = CSVFormat.DEFAULT.withFirstRecordAsHeader().withRecordSeparator(System.lineSeparator()).withQuoteMode(QuoteMode.NON_NUMERIC)
Expand Down Expand Up @@ -176,6 +181,9 @@ object CollectionCSVManager extends CollectionInputFileReader {
try {
if (csvPrinter != null) csvPrinter.close()
if (out != null) out.close()
// Close fos explicitly in case OutputStreamWriter construction failed
// and out was never assigned (in which case fos would otherwise leak).
if (fos != null) fos.close()
if (null != csvFile && csvFile.exists) deleteQuietly(csvFile.getCanonicalFile)
} catch {
case e: IOException =>
Expand Down