use getMethod("main",blahblah) instead of getMe...

use getMethod("main",blahblah) instead of getMethods().find(blahblah)

1 files changed, 3 insertions, 17 deletions

diff --git a/src/compiler/scala/tools/nsc/ObjectRunner.scala b/src/compiler/scala/tools/nsc/ObjectRunner.scala
index d2202f5046..d64ad2947d 100644
--- a/src/compiler/scala/tools/nsc/ObjectRunner.scala
+++ b/src/compiler/scala/tools/nsc/ObjectRunner.scala
@@ -13,16 +13,6 @@ import java.net.URLClassLoader
 
 /** An object that runs another object specified by name. */
 object ObjectRunner {
-
-  def isMainMethod(meth: Method): Boolean = {
-    def paramsOK(params: Array[Class]): Boolean =
-      params.length == 1 &&
-      params(0) == classOf[Array[String]]
-    meth.getName == "main" &&
-    Modifier.isStatic(meth.getModifiers) &&
-    paramsOK(meth.getParameterTypes)
-  }
-
   def run(
       classpath: List[String],
       objectName: String,
@@ -32,17 +22,13 @@ object ObjectRunner {
       val mainLoader = new URLClassLoader(classpathURLs, null)
       val clsToRun = Class.forName(objectName, true, mainLoader)
 
-      val method = clsToRun.getMethods.find(isMainMethod) match {
-        case Some(meth) =>
-          meth
-        case None =>
-          throw new Error("no main method in object " + objectName)
-      }
+      val method = clsToRun.getMethod("main", List(classOf[Array[String]]).toArray)
+
       val res = method.invoke(null, List(arguments.toArray).toArray)
       ()
     } catch {
       case e: Exception =>
-        // ClassNotFoundException, InvocationTargetException, ..
+        // ClassNotFoundException, InvocationTargetException, NoSuchMethod ..
         Console.println(e)
         exit(1)
     }