--- a/src/hotspot/share/oops/klass.cpp	Thu May 03 08:07:20 2018 -0400
+++ b/src/hotspot/share/oops/klass.cpp	Fri Apr 27 15:00:04 2018 -0400
@@ -384,8 +384,8 @@
   debug_only(verify();)
 }
 
-void Klass::clean_weak_klass_links(bool clean_alive_klasses) {
-  if (!ClassUnloading) {
+void Klass::clean_weak_klass_links(bool unloading_occurred, bool clean_alive_klasses) {
+  if (!ClassUnloading || !unloading_occurred) {
     return;
   }