From 636883194c43e59652991399437d3080bd571f34 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 15 Sep 2021 14:37:47 +0200 Subject: [PATCH 1/3] Close more opened streams after reading --- .../src/main/scala/scoverage/Serializer.scala | 3 ++- .../scoverage/report/ScoverageHtmlWriter.scala | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala index 98667dd0..3030c010 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala @@ -85,7 +85,8 @@ object Serializer { new File(dataDir, Constants.CoverageFileName) def deserialize(file: File): Coverage = { - deserialize(Source.fromFile(file)(Codec.UTF8).getLines()) + val source = Source.fromFile(file)(Codec.UTF8) + deserialize(try source.getLines() finally source.close()) } def deserialize(lines: Iterator[String]): Coverage = { diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala index 791d397c..c2fd3721 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala @@ -39,12 +39,16 @@ class ScoverageHtmlWriter( val packageFile = new File(outputDir.getAbsolutePath + "/packages.html") val overviewFile = new File(outputDir.getAbsolutePath + "/overview.html") - val index = IOUtils.readStreamAsString( - getClass.getResourceAsStream("/scoverage/index.html") - ) - val css = IOUtils.readStreamAsString( - getClass.getResourceAsStream("/scoverage/pure-min.css") - ) + val index = { + val in = getClass.getResourceAsStream("/scoverage/index.html") + try IOUtils.readStreamAsString(in) + finally in.close() + } + val css = { + val in = getClass.getResourceAsStream("/scoverage/pure-min.css") + try IOUtils.readStreamAsString(in) + finally in.close() + } IOUtils.writeToFile(indexFile, index) IOUtils.writeToFile(cssFile, css) IOUtils.writeToFile(packageFile, packageList(coverage).toString()) From 0e02976bb03b284ccca792e435913e4c5389650c Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 15 Sep 2021 14:39:59 +0200 Subject: [PATCH 2/3] Code formatted --- .../src/main/scala/scoverage/Serializer.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala index 3030c010..491482bd 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala @@ -86,7 +86,10 @@ object Serializer { def deserialize(file: File): Coverage = { val source = Source.fromFile(file)(Codec.UTF8) - deserialize(try source.getLines() finally source.close()) + deserialize( + try source.getLines() + finally source.close() + ) } def deserialize(lines: Iterator[String]): Coverage = { From 1180294bb327ecbf3363002536da1a05236654f8 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 15 Sep 2021 14:57:11 +0200 Subject: [PATCH 3/3] Close stream after using it --- .../src/main/scala/scoverage/Serializer.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala index 491482bd..12f2c49c 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala @@ -86,10 +86,8 @@ object Serializer { def deserialize(file: File): Coverage = { val source = Source.fromFile(file)(Codec.UTF8) - deserialize( - try source.getLines() - finally source.close() - ) + try deserialize(source.getLines()) + finally source.close() } def deserialize(lines: Iterator[String]): Coverage = {