diff options
| author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2008-08-06 12:18:30 +0000 |
|---|---|---|
| committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2008-08-06 12:18:30 +0000 |
| commit | 8a8230837a330c90132f093d299400fd98f1cadf (patch) | |
| tree | c8f0972d36315cc2d867e85f0635053eeae63c36 | |
| parent | 9c72f1a023ce52685ba58a6a26e18085a910ca24 (diff) | |
| download | scala-8a8230837a330c90132f093d299400fd98f1cadf.tar.gz scala-8a8230837a330c90132f093d299400fd98f1cadf.tar.bz2 scala-8a8230837a330c90132f093d299400fd98f1cadf.zip | |
Hardening classpath against sourcepath crash.
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/ClassPath.scala | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index f2874a024b..e8a8ea5c47 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -192,20 +192,13 @@ class ClassPath(onlyPresentation: Boolean) { def classFile = if (!isSourceFile) entries.head.location else null - { - val sourcePath0 = sourcePath - if (sourcePath0 ne null) { - if (!sourcePath0.isDirectory) { - Console.err.println(""+sourcePath0 + " should be a directory") - assert(false) - } - } - } - def sourcePath = if (!isSourceFile && !entries.isEmpty && (entries.head.source ne null)) { val ret = entries.head.source.location - ret + if ((ret ne null) && !ret.isDirectory) { + Console.err.println("source path " + ret + " is not a directory") + null + } else ret } else null |