1.1 --- a/src/share/vm/gc_implementation/shared/vmGCOperations.cpp Mon Aug 04 15:04:45 2014 +0200 1.2 +++ b/src/share/vm/gc_implementation/shared/vmGCOperations.cpp Wed Aug 06 09:55:16 2014 +0200 1.3 @@ -209,6 +209,7 @@ 1.4 gch->do_full_collection(gch->must_clear_all_soft_refs(), _max_level); 1.5 } 1.6 1.7 +// Returns true iff concurrent GCs unloads metadata. 1.8 bool VM_CollectForMetadataAllocation::initiate_concurrent_GC() { 1.9 #if INCLUDE_ALL_GCS 1.10 if (UseConcMarkSweepGC && CMSClassUnloadingEnabled) { 1.11 @@ -216,7 +217,7 @@ 1.12 return true; 1.13 } 1.14 1.15 - if (UseG1GC) { 1.16 + if (UseG1GC && ClassUnloadingWithConcurrentMark) { 1.17 G1CollectedHeap* g1h = G1CollectedHeap::heap(); 1.18 g1h->g1_policy()->set_initiate_conc_mark_if_possible(); 1.19