1 files changed, 13 insertions, 11 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala
index 4fd5768b79..4d71e0e09e 100644
--- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala
@@ -12,6 +12,7 @@ import scala.annotation.tailrec
 import Predef.{ println => _, _ }
 import interpreter.session._
 import StdReplTags._
+import scala.tools.asm.ClassReader
 import scala.util.Properties.{ jdkHome, javaVersion, versionString, javaVmName }
 import scala.tools.nsc.util.{ ClassPath, Exceptional, stringFromWriter, stringFromStream }
 import scala.reflect.classTag
@@ -633,28 +634,29 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
    *  the interpreter and replays all interpreter expressions.
    */
   def require(arg: String): Unit = {
-    class InfoClassLoader extends java.lang.ClassLoader {
-      def classOf(arr: Array[Byte]): Class[_] =
-        super.defineClass(null, arr, 0, arr.length)
-    }
-
     val f = File(arg).normalize
 
-    if (f.isDirectory) {
-      echo("Adding directories to the classpath is not supported. Add a jar instead.")
+    val jarFile = AbstractFile.getDirectory(new java.io.File(arg))
+    if (jarFile == null) {
+      echo(s"Cannot load '$arg'")
       return
     }
 
-    val jarFile = AbstractFile.getDirectory(new java.io.File(arg))
-
     def flatten(f: AbstractFile): Iterator[AbstractFile] =
       if (f.isClassContainer) f.iterator.flatMap(flatten)
       else Iterator(f)
 
     val entries = flatten(jarFile)
-    val cloader = new InfoClassLoader
 
-    def classNameOf(classFile: AbstractFile): String = cloader.classOf(classFile.toByteArray).getName
+    def classNameOf(classFile: AbstractFile): String = {
+      val input = classFile.input
+      try {
+        val reader = new ClassReader(input)
+        reader.getClassName.replace('/', '.')
+      } finally {
+        input.close()
+      }
+    }
     def alreadyDefined(clsName: String) = intp.classLoader.tryToLoadClass(clsName).isDefined
     val exists = entries.filter(_.hasExtension("class")).map(classNameOf).exists(alreadyDefined)