[vmkit-commits] [vmkit] r114291 - in /vmkit/trunk/lib/J3: Classpath/JavaUpcalls.cpp VMCore/JnjvmClassLoader.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sat Sep 18 12:49:32 2010
New Revision: 114291

URL: http://llvm.org/viewvc/llvm-project?rev=114291&view=rev
Log:
Invoke loadClass(String), not loadClass(String, boolean).


Modified:
    vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
    vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp

Modified: vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp?rev=114291&r1=114290&r2=114291&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp Sat Sep 18 12:49:32 2010
@@ -743,7 +743,7 @@
 
   loadInClassLoader =
     UPCALL_METHOD(loader, "java/lang/ClassLoader", "loadClass",
-                  "(Ljava/lang/String;Z)Ljava/lang/Class;", ACC_VIRTUAL);
+                  "(Ljava/lang/String;)Ljava/lang/Class;", ACC_VIRTUAL);
 
   JavaMethod* internString =
     UPCALL_METHOD(loader, "java/lang/VMString", "intern",

Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp?rev=114291&r1=114290&r2=114291&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp Sat Sep 18 12:49:32 2010
@@ -383,7 +383,7 @@
       strName = JavaString::internalToJava(name, isolate);
     }
     obj = loadClassMethod->invokeJavaObjectVirtual(isolate, forCtp, javaLoader,
-                                                   &strName, doResolve);
+                                                   &strName);
     cl = JavaObjectClass::getClass(((JavaObjectClass*)obj));
   }