harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcfi...@apache.org
Subject svn commit: r633487 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
Date Tue, 04 Mar 2008 14:35:05 GMT
Author: mcfirst
Date: Tue Mar  4 06:35:04 2008
New Revision: 633487

URL: http://svn.apache.org/viewvc?rev=633487&view=rev
Log:
Applying patch from HARMONY-5566 [drlvm][kernel] assert in VMStack.getStackClasses() on SerializableClassesTest
from the reliability test suite

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp?rev=633487&r1=633486&r2=633487&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_vm_VMStack.cpp
Tue Mar  4 06:35:04 2008
@@ -363,13 +363,21 @@
     StackTraceFrame* frames = (StackTraceFrame*) array_data;
     unsigned size = jenv->GetArrayLength(array) * 8 / sizeof(StackTraceFrame);
 
-    static Method_Handle fillInStackTrace = class_lookup_method(
-        genv->java_lang_Throwable_Class,
-            "fillInStackTrace", "()Ljava/lang/Throwable;");
+    static Method_Handle fillInStackTrace = NULL;
+    if (!fillInStackTrace) {
+        fillInStackTrace =
+            class_lookup_method(genv->java_lang_Throwable_Class,
+                "fillInStackTrace", "()Ljava/lang/Throwable;");
+        assert(fillInStackTrace);
+    }
 
-    static Method_Handle threadRunImpl = class_lookup_method(
-        genv->java_lang_Thread_Class,
-            "runImpl", "()V");
+    static Method_Handle threadRunImpl = NULL;
+    if (!threadRunImpl) {
+        threadRunImpl =
+            class_lookup_method(genv->java_lang_Thread_Class,
+                "runImpl", "()V");
+        assert(threadRunImpl);
+    }
 
     unsigned skip;
 



Mime
View raw message