diff options
| -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) |