diff src/share/vm/classfile/systemDictionary.cpp @ 20770:02c7eebe5f52

Merge
author asaha
date Wed, 19 Nov 2014 12:52:56 -0800
parents c2844108a708 b12a2a9b05ca
children 9fa3bf3043a2
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp	Thu Nov 06 09:15:23 2014 -0800
+++ b/src/share/vm/classfile/systemDictionary.cpp	Wed Nov 19 12:52:56 2014 -0800
@@ -1691,9 +1691,9 @@
 
 // Assumes classes in the SystemDictionary are only unloaded at a safepoint
 // Note: anonymous classes are not in the SD.
-bool SystemDictionary::do_unloading(BoolObjectClosure* is_alive) {
+bool SystemDictionary::do_unloading(BoolObjectClosure* is_alive, bool clean_alive) {
   // First, mark for unload all ClassLoaderData referencing a dead class loader.
-  bool unloading_occurred = ClassLoaderDataGraph::do_unloading(is_alive);
+  bool unloading_occurred = ClassLoaderDataGraph::do_unloading(is_alive, clean_alive);
   if (unloading_occurred) {
     dictionary()->do_unloading();
     constraints()->purge_loader_constraints();