From 04ee526ca7f9d8f786b4b3e5a8d7209ceaa698ba Mon Sep 17 00:00:00 2001 From: Heather Miller Date: Thu, 16 Oct 2014 14:22:17 -0700 Subject: SI-6502 Addresses comments by @som-snytt --- src/repl/scala/tools/nsc/interpreter/ILoop.scala | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/repl') diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index c35de9a424..209e3f96bd 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -652,8 +652,8 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) val jarFile = AbstractFile.getDirectory(new java.io.File(arg)) - def flatten(f: AbstractFile): Iterator[AbstractFile] = - if (f.isClassContainer) f.iterator.flatMap(flatten) + def flatten(f: AbstractFile): Iterator[AbstractFile] = + if (f.isClassContainer) f.iterator.flatMap(flatten) else Iterator(f) val entries = flatten(jarFile) @@ -669,13 +669,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) // read InputStream into Array[Byte] val arr = readFully(is) val clazz = cloader.classOf(arr) - try { - // pass initialize = false because we don't want to execute class initializers: - Class.forName(clazz.getName(), false, intp.classLoader) - exists = true - } catch { - case _: ClassNotFoundException => /* do nothing */ - } + if ((intp.classLoader tryToLoadClass clazz.getName).isDefined) exists = true } } -- cgit v1.2.3