Skip to content

Close more opened streams after reading #373

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 3 commits into from
Sep 15, 2021
Merged

Close more opened streams after reading #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6368831
Close more opened streams after reading
lefou Sep 15, 2021
0e02976
Code formatted
lefou Sep 15, 2021
1180294
Close stream after using it
lefou Sep 15, 2021
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
4 changes: 3 additions & 1 deletion scalac-scoverage-plugin/src/main/scala/scoverage/Serializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ 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)
try deserialize(source.getLines())
finally source.close()
}

def deserialize(lines: Iterator[String]): Coverage = {
Expand Down
16 changes: 10 additions & 6 deletions scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down