src/hotspot/share/services/management.cpp

*** 176,194 ****
    memcpy(support, &_optional_support, sizeof(jmmOptionalSupport));
  }
  
  InstanceKlass* Management::load_and_initialize_klass(Symbol* sh, TRAPS) {
    Klass* k = SystemDictionary::resolve_or_fail(sh, true, CHECK_NULL);
!   return initialize_klass(k, CHECK_NULL);
  }
  
  InstanceKlass* Management::load_and_initialize_klass_or_null(Symbol* sh, TRAPS) {
    Klass* k = SystemDictionary::resolve_or_null(sh, CHECK_NULL);
    if (k == NULL) {
       return NULL;
    }
!   return initialize_klass(k, CHECK_NULL);
  }
  
  InstanceKlass* Management::initialize_klass(Klass* k, TRAPS) {
    InstanceKlass* ik = InstanceKlass::cast(k);
    if (ik->should_be_initialized()) {
--- 176,194 ----
    memcpy(support, &_optional_support, sizeof(jmmOptionalSupport));
  }
  
  InstanceKlass* Management::load_and_initialize_klass(Symbol* sh, TRAPS) {
    Klass* k = SystemDictionary::resolve_or_fail(sh, true, CHECK_NULL);
!   return initialize_klass(k, THREAD);
  }
  
  InstanceKlass* Management::load_and_initialize_klass_or_null(Symbol* sh, TRAPS) {
    Klass* k = SystemDictionary::resolve_or_null(sh, CHECK_NULL);
    if (k == NULL) {
       return NULL;
    }
!   return initialize_klass(k, THREAD);
  }
  
  InstanceKlass* Management::initialize_klass(Klass* k, TRAPS) {
    InstanceKlass* ik = InstanceKlass::cast(k);
    if (ik->should_be_initialized()) {