hotspot/src/share/vm/services/gcNotifier.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 75,85 ****
    return first_request != NULL;
  }
  
  static Handle getGcInfoBuilder(GCMemoryManager *gcManager,TRAPS) {
  
!   Klass* k = Management::sun_management_GarbageCollectorImpl_klass(CHECK_NH);
    instanceKlassHandle gcMBeanKlass (THREAD, k);
  
    instanceOop i = gcManager->get_memory_manager_instance(THREAD);
    instanceHandle ih(THREAD, i);
  
--- 75,85 ----
    return first_request != NULL;
  }
  
  static Handle getGcInfoBuilder(GCMemoryManager *gcManager,TRAPS) {
  
!   Klass* k = Management::com_sun_management_internal_GarbageCollectorExtImpl_klass(CHECK_NH);
    instanceKlassHandle gcMBeanKlass (THREAD, k);
  
    instanceOop i = gcManager->get_memory_manager_instance(THREAD);
    instanceHandle ih(THREAD, i);
  
*** 212,223 ****
      Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, CHECK);
  
      Handle objName = java_lang_String::create_from_str(request->gcManager->name(), CHECK);
      Handle objAction = java_lang_String::create_from_str(request->gcAction, CHECK);
      Handle objCause = java_lang_String::create_from_str(request->gcCause, CHECK);
  
-     Klass* k = Management::sun_management_GarbageCollectorImpl_klass(CHECK);
      instanceKlassHandle gc_mbean_klass(THREAD, k);
  
      instanceOop gc_mbean = request->gcManager->get_memory_manager_instance(THREAD);
      instanceHandle gc_mbean_h(THREAD, gc_mbean);
      if (!gc_mbean_h->is_a(k)) {
--- 212,223 ----
      Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, CHECK);
  
      Handle objName = java_lang_String::create_from_str(request->gcManager->name(), CHECK);
      Handle objAction = java_lang_String::create_from_str(request->gcAction, CHECK);
      Handle objCause = java_lang_String::create_from_str(request->gcCause, CHECK);
+     Klass* k = Management::com_sun_management_internal_GarbageCollectorExtImpl_klass(CHECK);
  
      instanceKlassHandle gc_mbean_klass(THREAD, k);
  
      instanceOop gc_mbean = request->gcManager->get_memory_manager_instance(THREAD);
      instanceHandle gc_mbean_h(THREAD, gc_mbean);
      if (!gc_mbean_h->is_a(k)) {