svn commit: r500157 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp

[gs...@apache.org]

Author: gshimansky
Date: Thu Jan 25 22:57:59 2007
New Revision: 500157

URL: http://svn.apache.org/viewvc?view=rev&rev=500157
Log:
Fixed assertion to use correct way to get exception object in suspend_disabled
state, in this state exn_get() cannot be called.


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?view=diff&rev=500157&r1=500156&r2=500157
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Thu Jan 25 22:57:59 2007
@@ -516,7 +516,8 @@
     thread_handle = oh_allocate_global_handle();
     thread_handle->object = class_alloc_new_object(thread_class);
     if (thread_handle->object == NULL) {
-        assert(exn_raised() && exn_get()->object == vm_env->java_lang_OutOfMemoryError->object);
+        assert(!hythread_is_suspend_enabled());
+        assert(exn_raised() && p_TLS_vmthread->thread_exception.exc_object == vm_env->java_lang_OutOfMemoryError->object);
         return JNI_ENOMEM;
     }
     *thread_object = thread_handle;