src/share/vm/runtime/thread.cpp

*** 2868,2885 ****
  // descriptive string if there is no set name
  const char* JavaThread::get_thread_name_string(char* buf, int buflen) const {
    const char* name_str;
    oop thread_obj = threadObj();
    if (thread_obj != NULL) {
!     typeArrayOop name = java_lang_Thread::name(thread_obj);
      if (name != NULL) {
        if (buf == NULL) {
!         name_str = UNICODE::as_utf8((jchar*) name->base(T_CHAR),
!                                     name->length());
        } else {
!         name_str = UNICODE::as_utf8((jchar*) name->base(T_CHAR),
!                                     name->length(), buf, buflen);
        }
      } else if (is_attaching_via_jni()) { // workaround for 6412693 - see 6404306
        name_str = "<no-name - thread is attaching>";
      } else {
        name_str = Thread::name();
--- 2868,2883 ----
  // descriptive string if there is no set name
  const char* JavaThread::get_thread_name_string(char* buf, int buflen) const {
    const char* name_str;
    oop thread_obj = threadObj();
    if (thread_obj != NULL) {
!     oop name = java_lang_Thread::name(thread_obj);
      if (name != NULL) {
        if (buf == NULL) {
!         name_str = java_lang_String::as_utf8_string(name);
        } else {
!         name_str = java_lang_String::as_utf8_string(name, buf, buflen);
        }
      } else if (is_attaching_via_jni()) { // workaround for 6412693 - see 6404306
        name_str = "<no-name - thread is attaching>";
      } else {
        name_str = Thread::name();