Skip to content

Commit d524e28

Browse files
authored
Merge pull request #2506 from dotty-staging/fix-races
Fix race conditions due to non-volatile lazy vals
2 parents 5efbe52 + 795c1ae commit d524e28

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

compiler/src/dotty/tools/io/AbstractFile.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ abstract class AbstractFile extends Iterable[AbstractFile] {
9898

9999
/** Checks extension case insensitively. */
100100
def hasExtension(other: String) = extension == other.toLowerCase
101-
private lazy val extension: String = Path.extension(name)
101+
private val extension: String = Path.extension(name)
102102

103103
/** The absolute file, if this is a relative file. */
104104
def absolute: AbstractFile

compiler/src/dotty/tools/io/ZipArchive.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ final class FileZipArchive(file: JFile) extends ZipArchive(file) {
149149
override def sizeOption: Option[Int] = Some(zipEntry.getSize.toInt)
150150
}
151151

152-
lazy val (root, allDirs) = {
152+
val (root, allDirs) = {
153153
val root = new DirEntry("/")
154154
val dirs = mutable.HashMap[String, DirEntry]("/" -> root)
155155
val zipFile = openZipFile()

0 commit comments

Comments
 (0)