[vmkit-commits] [vmkit] r147397 - /vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Will Dietz wdietz2 at illinois.edu
Sun Jan 1 05:14:33 PST 2012


Author: wdietz2
Date: Sun Jan  1 07:14:33 2012
New Revision: 147397

URL: http://llvm.org/viewvc/llvm-project?rev=147397&view=rev
Log:
Small robustification improvement to JVM_GetClassAnnotations

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=147397&r1=147396&r2=147397&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Sun Jan  1 07:14:33 2012
@@ -1705,9 +1705,9 @@
   Cl = cls ? *(JavaObjectClass**)cls : 0;
   verifyNull(Cl);
   Class * cl = JavaObjectClass::getClass(Cl)->asClass();
-  assert(cl);
 
-  ret = JavaObjectClass::getAnnotations(cl);
+  if (cl)
+    ret = JavaObjectClass::getAnnotations(cl);
 
   RETURN_REF_FROM_JNI(ret, jbyteArray);
 





More information about the vmkit-commits mailing list