Re-commented the assert out, it should probably be
assert(!parent.entries.contains(name)), I got the boolean logic wrong on the last commit. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@14467 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
3792697696
commit
3ee15413df
|
@ -125,7 +125,10 @@ final class ZipArchive(file: File, val archive: ZipFile) extends PlainFile(file)
|
|||
val name = if (index < 0) path else path.substring(index + 1)
|
||||
val home = if (index < 0) "/" else path.substring(0, index + 1)
|
||||
val parent: DirEntry = getDir(dirs, home)
|
||||
assert(!parent.entries.contains(path), this.toString() + " - " + path)
|
||||
// OLD: assert(!parent.entries.contains(path))
|
||||
// MAYBE: assert(!parent.entries.contains(name))
|
||||
//if (parent.entries.contains(name))
|
||||
// Console.println("XXX: " + this.toString() + " - " + home + "/" + name)
|
||||
parent.entries.update(name, new FileEntry(parent, name, path, entry))
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue