harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r543132 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp
Date Thu, 31 May 2007 13:44:18 GMT
Author: gshimansky
Date: Thu May 31 06:44:18 2007
New Revision: 543132

URL: http://svn.apache.org/viewvc?view=rev&rev=543132
Log:
Applied HARMONY-3675 [drlvm][classloader] vm.classloading.ClassAttributeTest reliability test
fails with assertion


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp?view=diff&rev=543132&r1=543131&r2=543132
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/annotations.cpp Thu May 31 06:44:18
2007
@@ -40,14 +40,17 @@
 {
     unsigned table_num = table ? table->length : 0;
     TRACE("annotations table size = " << table_num);
-    
+
     unsigned inv_table_num = inv_table ? inv_table->length : 0;
     TRACE("invisible annotations table size = " << inv_table_num);
-    
+
     unsigned num = table_num + inv_table_num;
 
-    static Class* antn_class = jni_get_vm_env(jenv)->LoadCoreClass(
-        "java/lang/annotation/Annotation");
+    static Class* antn_class;
+    if(antn_class == NULL) {
+        antn_class = jni_get_vm_env(jenv)->LoadCoreClass(
+            "java/lang/annotation/Annotation");
+    }
 
     jobjectArray array = NewObjectArray(jenv, num, 
         struct_Class_to_java_lang_Class_Handle(antn_class), NULL);



Mime
View raw message