src/share/vm/gc_implementation/g1/concurrentMark.cpp

*** 2165,2175 ****
    // We need to make this be a "collection" so any collection pause that
    // races with it goes around and waits for completeCleanup to finish.
    g1h->increment_total_collections();
  
    // Clean out dead classes and update Metaspace sizes.
!   if (G1ClassUnloadingEnabled) {
      ClassLoaderDataGraph::purge();
    }
    MetaspaceGC::compute_new_size();
  
    // We reclaimed old regions so we should calculate the sizes to make
--- 2165,2175 ----
    // We need to make this be a "collection" so any collection pause that
    // races with it goes around and waits for completeCleanup to finish.
    g1h->increment_total_collections();
  
    // Clean out dead classes and update Metaspace sizes.
!   if (ClassUnloadingWithConcurrentMark) {
      ClassLoaderDataGraph::purge();
    }
    MetaspaceGC::compute_new_size();
  
    // We reclaimed old regions so we should calculate the sizes to make
*** 2600,2610 ****
  
    // Unload Klasses, String, Symbols, Code Cache, etc.
    {
      G1RemarkGCTraceTime trace("Unloading", G1Log::finer());
  
!     if (G1ClassUnloadingEnabled) {
        bool purged_classes;
  
        {
          G1RemarkGCTraceTime trace("System Dictionary Unloading", G1Log::finest());
          purged_classes = SystemDictionary::do_unloading(&g1_is_alive);
--- 2600,2610 ----
  
    // Unload Klasses, String, Symbols, Code Cache, etc.
    {
      G1RemarkGCTraceTime trace("Unloading", G1Log::finer());
  
!     if (ClassUnloadingWithConcurrentMark) {
        bool purged_classes;
  
        {
          G1RemarkGCTraceTime trace("System Dictionary Unloading", G1Log::finest());
          purged_classes = SystemDictionary::do_unloading(&g1_is_alive);