Mercurial > hg > graal-compiler
diff src/share/vm/classfile/javaClasses.cpp @ 11020:3a0774193f71
Merge
author | chegar |
---|---|
date | Wed, 19 Jun 2013 11:02:10 +0100 |
parents | eaf3742822ec f2110083203d |
children | 6b0fd0964b87 ca0165daa6ec |
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.cpp Mon Jun 17 11:17:49 2013 +0100 +++ b/src/share/vm/classfile/javaClasses.cpp Wed Jun 19 11:02:10 2013 +0100 @@ -961,7 +961,7 @@ // Read thread status value from threadStatus field in java.lang.Thread java class. java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) { - assert(Thread::current()->is_VM_thread() || + assert(Thread::current()->is_Watcher_thread() || Thread::current()->is_VM_thread() || JavaThread::current()->thread_state() == _thread_in_vm, "Java Thread is not running in vm"); // The threadStatus is only present starting in 1.5