diff options
| author | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-11-13 23:05:51 +0000 |
|---|---|---|
| committer | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-11-13 23:05:51 +0000 |
| commit | 6866d592b9355551b2d3d337081fd1a849f852d1 (patch) | |
| tree | a271cb718b845cad1ca6d1faec136b1f8e78110e | |
| parent | f20f480fca746286135bb0c40a34f992fca992a5 (diff) | |
| download | scala-6866d592b9355551b2d3d337081fd1a849f852d1.tar.gz scala-6866d592b9355551b2d3d337081fd1a849f852d1.tar.bz2 scala-6866d592b9355551b2d3d337081fd1a849f852d1.zip | |
Applied Paul's patch for #1380, moved test out ...
Applied Paul's patch for #1380, moved test out of pending.
| -rw-r--r-- | src/compiler/scala/tools/nsc/io/ZipArchive.scala | 5 | ||||
| -rw-r--r-- | test/files/pos/t1380.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t1380/gnujaxp.jar.desired.sha1 (renamed from test/pending/pos/t1380/gnujaxp.jar.desired.sha1) | 0 | ||||
| -rw-r--r-- | test/files/pos/t1380/hallo.scala (renamed from test/pending/pos/t1380/hallo.scala) | 0 | ||||
| -rw-r--r-- | test/pending/pos/t1380.flags | 1 |
5 files changed, 4 insertions, 3 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) diff --git a/test/files/pos/t1380.flags b/test/files/pos/t1380.flags new file mode 100644 index 0000000000..f0b0ef7f51 --- /dev/null +++ b/test/files/pos/t1380.flags @@ -0,0 +1 @@ +-cp pending/pos/t1380/gnujaxp.jar diff --git a/test/pending/pos/t1380/gnujaxp.jar.desired.sha1 b/test/files/pos/t1380/gnujaxp.jar.desired.sha1 index c155c2aaa2..c155c2aaa2 100644 --- a/test/pending/pos/t1380/gnujaxp.jar.desired.sha1 +++ b/test/files/pos/t1380/gnujaxp.jar.desired.sha1 diff --git a/test/pending/pos/t1380/hallo.scala b/test/files/pos/t1380/hallo.scala index 27ecd9fb8b..27ecd9fb8b 100644 --- a/test/pending/pos/t1380/hallo.scala +++ b/test/files/pos/t1380/hallo.scala diff --git a/test/pending/pos/t1380.flags b/test/pending/pos/t1380.flags deleted file mode 100644 index be71b662b7..0000000000 --- a/test/pending/pos/t1380.flags +++ /dev/null @@ -1 +0,0 @@ --Ydebug -cp pending/pos/t1380/gnujaxp.jar |