Merge pull request #2915 from dotty-staging/improve-#2506

liufengyun · web-flow · commit 7703493f492d · 2017-07-26T12:02:58.000+02:00
Alternative fix for #2506 that does not force dirs
diff --git a/compiler/src/dotty/tools/io/ZipArchive.scala b/compiler/src/dotty/tools/io/ZipArchive.scala
@@ -149,7 +149,7 @@ final class FileZipArchive(file: JFile) extends ZipArchive(file) {
     override def sizeOption: Option[Int] = Some(zipEntry.getSize.toInt)
   }
 
-  val (root, allDirs) = {
+  @volatile lazy val (root, allDirs) = {
     val root = new DirEntry("/")
     val dirs = mutable.HashMap[String, DirEntry]("/" -> root)
     val zipFile = openZipFile()

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ final class FileZipArchive(file: JFile) extends ZipArchive(file) {`
`149`	`149`	`override def sizeOption: Option[Int] = Some(zipEntry.getSize.toInt)`
`150`	`150`	`}`
`151`	`151`
`152`		`- val (root, allDirs) = {`
	`152`	`+ @volatile lazy val (root, allDirs) = {`
`153`	`153`	`val root = new DirEntry("/")`
`154`	`154`	`val dirs = mutable.HashMap[String, DirEntry]("/" -> root)`
`155`	`155`	`val zipFile = openZipFile()`