Skip to content

Commit a1c9f90

Browse files
lefouckipp01
authored andcommitted
Close more opened streams after reading (#373)
* Close more opened streams after reading * Code formatted * Close stream after using it
1 parent e31cc35 commit a1c9f90

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ object Serializer {
8585
new File(dataDir, Constants.CoverageFileName)
8686

8787
def deserialize(file: File): Coverage = {
88-
deserialize(Source.fromFile(file)(Codec.UTF8).getLines())
88+
val source = Source.fromFile(file)(Codec.UTF8)
89+
try deserialize(source.getLines())
90+
finally source.close()
8991
}
9092

9193
def deserialize(lines: Iterator[String]): Coverage = {

scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,16 @@ class ScoverageHtmlWriter(
3939
val packageFile = new File(outputDir.getAbsolutePath + "/packages.html")
4040
val overviewFile = new File(outputDir.getAbsolutePath + "/overview.html")
4141

42-
val index = IOUtils.readStreamAsString(
43-
getClass.getResourceAsStream("/scoverage/index.html")
44-
)
45-
val css = IOUtils.readStreamAsString(
46-
getClass.getResourceAsStream("/scoverage/pure-min.css")
47-
)
42+
val index = {
43+
val in = getClass.getResourceAsStream("/scoverage/index.html")
44+
try IOUtils.readStreamAsString(in)
45+
finally in.close()
46+
}
47+
val css = {
48+
val in = getClass.getResourceAsStream("/scoverage/pure-min.css")
49+
try IOUtils.readStreamAsString(in)
50+
finally in.close()
51+
}
4852
IOUtils.writeToFile(indexFile, index)
4953
IOUtils.writeToFile(cssFile, css)
5054
IOUtils.writeToFile(packageFile, packageList(coverage).toString())

0 commit comments

Comments
 (0)