[vmkit-commits] [vmkit] r70915 - /vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon May  4 16:14:29 2009
New Revision: 70915

URL: http://llvm.org/viewvc/llvm-project?rev=70915&view=rev
Log:
Bugfix when class argument is null.


Modified:
    vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp

Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp?rev=70915&r1=70914&r2=70915&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMClass.cpp Mon May  4 16:14:29 2009
@@ -327,9 +327,12 @@
   
   BEGIN_NATIVE_EXCEPTION(0)
 
+  if (!Cl2) JavaThread::get()->getJVM()->nullPointerException("");
+
   UserCommonClass* cl1 = ((JavaObjectClass*)Cl1)->getClass();
   UserCommonClass* cl2 = ((JavaObjectClass*)Cl2)->getClass();
 
+  if (cl1->isClass()) cl1->asClass()->resolveClass();
   if (cl2->asClass()) cl2->asClass()->resolveClass();
   res = cl2->isAssignableFrom(cl1);