diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/io/ZipArchive.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index dacfc0dd79..aa10febce5 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -118,8 +118,9 @@ final class ZipArchive(file: File, val archive: ZipFile) extends PlainFile(file) this.toString() + " - " + path); if (entry.isDirectory()) { val dir: DirEntry = getDir(dirs, path) - assert(dir.entry eq null, this.toString() + " - " + path) - dir.entry = entry + // this assertion causes an unnecessary bomb if a directory is twice listed in the jar + // assert(dir.entry eq null, this.toString() + " - " + path) + if (dir.entry eq null) dir.entry = entry } else { val index = path.lastIndexOf('/') val name = if (index < 0) path else path.substring(index + 1) |