src/hotspot/share/runtime/java.cpp

*** 339,349 ****
--- 339,351 ----
      alloc_stats.print();
      tty->cr();
    }
  
    if (PrintSystemDictionaryAtExit) {
+     ResourceMark rm;
      SystemDictionary::print();
+     ClassLoaderDataGraph::print();
    }
  
    if (LogTouchedMethods && PrintTouchedMethodsAtExit) {
      Method::print_touched_methods(tty);
    }
*** 481,491 ****
      ResourceMark rm;
      LogStream ls_info(log.info());
      Universe::print_on(&ls_info);
      if (log.is_trace()) {
        LogStream ls_trace(log.trace());
!       ClassLoaderDataGraph::dump_on(&ls_trace);
      }
    }
  
    if (PrintBytecodeHistogram) {
      BytecodeHistogram::print();
--- 483,493 ----
      ResourceMark rm;
      LogStream ls_info(log.info());
      Universe::print_on(&ls_info);
      if (log.is_trace()) {
        LogStream ls_trace(log.trace());
!       ClassLoaderDataGraph::print_on(&ls_trace);
      }
    }
  
    if (PrintBytecodeHistogram) {
      BytecodeHistogram::print();