Skip to content

Commit f43de1c

Browse files
smarterallanrenucci
authored andcommitted
Revert changes to ZipArchive
ZipArchive comes from scalac but was modified because the local class failed to be pickled correctly previously. This appear to be fixed now, so we can close scala#2340.
1 parent 57b857e commit f43de1c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,12 @@ final class ManifestResources(val url: URL) extends ZipArchive(null) {
205205
for (zipEntry <- iter) {
206206
val dir = getDir(dirs, zipEntry)
207207
if (!zipEntry.isDirectory) {
208-
val f = new Entry(zipEntry.getName) {
208+
class FileEntry() extends Entry(zipEntry.getName) {
209209
override def lastModified = zipEntry.getTime()
210210
override def input = resourceInputStream(path)
211211
override def sizeOption = None
212212
}
213+
val f = new FileEntry()
213214
dir.entries(f.name) = f
214215
}
215216
}

0 commit comments

Comments
 (0)