diff src/share/vm/oops/arrayKlass.cpp @ 20383:14b8221771dc

Merge
author tschatzl
date Wed, 03 Sep 2014 09:25:44 +0200
parents 6e0cb14ce59b
children 47e3110c47e8 8cb56c8cb30d
line wrap: on
line diff
--- a/src/share/vm/oops/arrayKlass.cpp	Wed Sep 03 09:24:07 2014 +0200
+++ b/src/share/vm/oops/arrayKlass.cpp	Wed Sep 03 09:25:44 2014 +0200
@@ -186,8 +186,9 @@
   set_component_mirror(NULL);
 }
 
-void ArrayKlass::restore_unshareable_info(TRAPS) {
-  Klass::restore_unshareable_info(CHECK);
+void ArrayKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
+  assert(loader_data == ClassLoaderData::the_null_class_loader_data(), "array classes belong to null loader");
+  Klass::restore_unshareable_info(loader_data, protection_domain, CHECK);
   // Klass recreates the component mirror also
 }