src/share/vm/runtime/thread.cpp

*** 2931,2946 ****
    debug_only(if (JavaThread::current() != this) assert_locked_or_safepoint(Threads_lock);)
    oop thread_obj = threadObj();
    if (thread_obj != NULL) {
      oop thread_group = java_lang_Thread::threadGroup(thread_obj);
      if (thread_group != NULL) {
-       typeArrayOop name = java_lang_ThreadGroup::name(thread_group);
        // ThreadGroup.name can be null
!       if (name != NULL) {
!         const char* str = UNICODE::as_utf8((jchar*) name->base(T_CHAR), name->length());
!         return str;
!       }
      }
    }
    return NULL;
  }
  
--- 2931,2942 ----
    debug_only(if (JavaThread::current() != this) assert_locked_or_safepoint(Threads_lock);)
    oop thread_obj = threadObj();
    if (thread_obj != NULL) {
      oop thread_group = java_lang_Thread::threadGroup(thread_obj);
      if (thread_group != NULL) {
        // ThreadGroup.name can be null
!       return java_lang_ThreadGroup::name(thread_group);
      }
    }
    return NULL;
  }
  
*** 2950,2965 ****
    if (thread_obj != NULL) {
      oop thread_group = java_lang_Thread::threadGroup(thread_obj);
      if (thread_group != NULL) {
        oop parent = java_lang_ThreadGroup::parent(thread_group);
        if (parent != NULL) {
-         typeArrayOop name = java_lang_ThreadGroup::name(parent);
          // ThreadGroup.name can be null
!         if (name != NULL) {
!           const char* str = UNICODE::as_utf8((jchar*) name->base(T_CHAR), name->length());
!           return str;
!         }
        }
      }
    }
    return NULL;
  }
--- 2946,2957 ----
    if (thread_obj != NULL) {
      oop thread_group = java_lang_Thread::threadGroup(thread_obj);
      if (thread_group != NULL) {
        oop parent = java_lang_ThreadGroup::parent(thread_group);
        if (parent != NULL) {
          // ThreadGroup.name can be null
!         return java_lang_ThreadGroup::name(parent);
        }
      }
    }
    return NULL;
  }
*** 3302,3311 ****
--- 3294,3306 ----
      create_vm_init_libraries();
    }
  
    initialize_class(vmSymbols::java_lang_String(), CHECK);
  
+   // Inject CompactStrings value after the static initializers for String ran.
+   java_lang_String::set_compact_strings(CompactStrings);
+ 
    // Initialize java_lang.System (needed before creating the thread)
    initialize_class(vmSymbols::java_lang_System(), CHECK);
    // The VM creates & returns objects of this class. Make sure it's initialized.
    initialize_class(vmSymbols::java_lang_Class(), CHECK);
    initialize_class(vmSymbols::java_lang_ThreadGroup(), CHECK);