src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp

@@ -477,11 +477,11 @@
   _collection_count_start(0),
   _verifying(false),
   _verification_mark_bm(0, Mutex::leaf + 1, "CMS_verification_mark_bm_lock"),
   _completed_initialization(false),
   _collector_policy(cp),
-  _should_unload_classes(CMSClassUnloadingEnabled),
+  _should_unload_classes(ClassUnloadingWithConcurrentMark),
   _concurrent_cycles_since_last_unload(0),
   _roots_scanning_options(GenCollectedHeap::SO_None),
   _inter_sweep_estimate(CMS_SweepWeight, CMS_SweepPadding),
   _intra_sweep_estimate(CMS_SweepWeight, CMS_SweepPadding),
   _gc_tracer_cm(new (ResourceObj::C_HEAP, mtGC) CMSTracer()),

@@ -2560,11 +2560,11 @@
 void CMSCollector::update_should_unload_classes() {
   _should_unload_classes = false;
   // Condition 1 above
   if (_full_gc_requested && ExplicitGCInvokesConcurrentAndUnloadsClasses) {
     _should_unload_classes = true;
-  } else if (CMSClassUnloadingEnabled) { // Condition 2.a above
+  } else if (ClassUnloadingWithConcurrentMark) { // Condition 2.a above
     // Disjuncts 2.b.(i,ii,iii) above
     _should_unload_classes = (concurrent_cycles_since_last_unload() >=
                               CMSClassUnloadingMaxInterval)
                            || _cmsGen->is_too_full();
   }