1.1 --- a/src/share/vm/runtime/thread.cpp Tue Jan 05 11:16:09 2010 -0800
1.2 +++ b/src/share/vm/runtime/thread.cpp Wed Jan 06 14:22:39 2010 -0800
1.3 @@ -957,7 +957,7 @@
1.4 return;
1.5 }
1.6
1.7 - KlassHandle group(this, SystemDictionary::threadGroup_klass());
1.8 + KlassHandle group(this, SystemDictionary::ThreadGroup_klass());
1.9 Handle threadObj(this, this->threadObj());
1.10
1.11 JavaCalls::call_special(&result,
1.12 @@ -1451,7 +1451,7 @@
1.13 // so call ThreadGroup.uncaughtException()
1.14 KlassHandle recvrKlass(THREAD, threadObj->klass());
1.15 CallInfo callinfo;
1.16 - KlassHandle thread_klass(THREAD, SystemDictionary::thread_klass());
1.17 + KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass());
1.18 LinkResolver::resolve_virtual_call(callinfo, threadObj, recvrKlass, thread_klass,
1.19 vmSymbolHandles::dispatchUncaughtException_name(),
1.20 vmSymbolHandles::throwable_void_signature(),
1.21 @@ -1467,7 +1467,7 @@
1.22 uncaught_exception,
1.23 THREAD);
1.24 } else {
1.25 - KlassHandle thread_group(THREAD, SystemDictionary::threadGroup_klass());
1.26 + KlassHandle thread_group(THREAD, SystemDictionary::ThreadGroup_klass());
1.27 JavaValue result(T_VOID);
1.28 JavaCalls::call_virtual(&result,
1.29 group, thread_group,
1.30 @@ -1488,7 +1488,7 @@
1.31 while (java_lang_Thread::threadGroup(threadObj()) != NULL && (count-- > 0)) {
1.32 EXCEPTION_MARK;
1.33 JavaValue result(T_VOID);
1.34 - KlassHandle thread_klass(THREAD, SystemDictionary::thread_klass());
1.35 + KlassHandle thread_klass(THREAD, SystemDictionary::Thread_klass());
1.36 JavaCalls::call_virtual(&result,
1.37 threadObj, thread_klass,
1.38 vmSymbolHandles::exit_method_name(),
1.39 @@ -1726,7 +1726,7 @@
1.40 // Check for pending async. exception
1.41 if (_pending_async_exception != NULL) {
1.42 // Only overwrite an already pending exception, if it is not a threadDeath.
1.43 - if (!has_pending_exception() || !pending_exception()->is_a(SystemDictionary::threaddeath_klass())) {
1.44 + if (!has_pending_exception() || !pending_exception()->is_a(SystemDictionary::ThreadDeath_klass())) {
1.45
1.46 // We cannot call Exceptions::_throw(...) here because we cannot block
1.47 set_pending_exception(_pending_async_exception, __FILE__, __LINE__);
1.48 @@ -1835,14 +1835,14 @@
1.49 if (is_Compiler_thread()) return;
1.50
1.51 // This is a change from JDK 1.1, but JDK 1.2 will also do it:
1.52 - if (java_throwable->is_a(SystemDictionary::threaddeath_klass())) {
1.53 + if (java_throwable->is_a(SystemDictionary::ThreadDeath_klass())) {
1.54 java_lang_Thread::set_stillborn(threadObj());
1.55 }
1.56
1.57 {
1.58 // Actually throw the Throwable against the target Thread - however
1.59 // only if there is no thread death exception installed already.
1.60 - if (_pending_async_exception == NULL || !_pending_async_exception->is_a(SystemDictionary::threaddeath_klass())) {
1.61 + if (_pending_async_exception == NULL || !_pending_async_exception->is_a(SystemDictionary::ThreadDeath_klass())) {
1.62 // If the topmost frame is a runtime stub, then we are calling into
1.63 // OptoRuntime from compiled code. Some runtime stubs (new, monitor_exit..)
1.64 // must deoptimize the caller before continuing, as the compiled exception handler table
