diff options
| author | michelou <michelou@epfl.ch> | 2007-06-19 11:42:05 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-06-19 11:42:05 +0000 |
| commit | 9867746f9a849170725c87a591eb3f10ab9f7c09 (patch) | |
| tree | 0597bfb193d62e9d4d772c024aea3332a4663cc4 /src/compiler/scala/tools/nsc/plugins/Plugin.scala | |
| parent | 7620e2d34b1ea9be56f7d76a450d6827de9bc433 (diff) | |
| download | scala-9867746f9a849170725c87a591eb3f10ab9f7c09.tar.gz scala-9867746f9a849170725c87a591eb3f10ab9f7c09.tar.bz2 scala-9867746f9a849170725c87a591eb3f10ab9f7c09.zip | |
fixed bug #1175 (jdk6)
Diffstat (limited to 'src/compiler/scala/tools/nsc/plugins/Plugin.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/plugins/Plugin.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/plugins/Plugin.scala b/src/compiler/scala/tools/nsc/plugins/Plugin.scala index f4c5a7b301..4f5e0a54bd 100644 --- a/src/compiler/scala/tools/nsc/plugins/Plugin.scala +++ b/src/compiler/scala/tools/nsc/plugins/Plugin.scala @@ -127,14 +127,14 @@ object Plugin { alljars ++= jars for { - dir <- dirs - entries = dir.listFiles.toList - sorted = entries.sort((f1,f2)=>f1.getName <= f2.getName) - ent <- sorted - if ent.toString.toLowerCase.endsWith(".jar") - pdesc <- loadDescription(ent) + dir <- dirs if dir.isDirectory + entries = dir.listFiles + if entries ne null + entry <- entries.toList.sort((f1, f2) => f1.getName <= f2.getName) + if entry.toString.toLowerCase endsWith ".jar" + pdesc <- loadDescription(entry) if !(ignoring contains pdesc.name) - } alljars += ent + } alljars += entry val loader = loaderFor(alljars.toList) alljars.toList.map(f => loadFrom(f,loader)).flatMap(x => x) |