Skip to content

Commit 40d7d03

Browse files
committed
8274338: com/sun/jdi/RedefineCrossEvent.java failed "assert(m != __null) failed: NULL mirror"
Reviewed-by: phh Backport-of: 172aed1a2d75756b140cb723133ac5fb67f7745e
1 parent 5a3a17b commit 40d7d03

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/hotspot/share/oops/instanceKlass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2367,6 +2367,9 @@ void InstanceKlass::restore_unshareable_info(ClassLoaderData* loader_data, Handl
23672367
constants()->restore_unshareable_info(CHECK);
23682368

23692369
if (array_klasses() != NULL) {
2370+
// To get a consistent list of classes we need MultiArray_lock to ensure
2371+
// array classes aren't observed while they are being restored.
2372+
MutexLocker ml(MultiArray_lock);
23702373
// Array classes have null protection domain.
23712374
// --> see ArrayKlass::complete_create_array_klass()
23722375
array_klasses()->restore_unshareable_info(ClassLoaderData::the_null_class_loader_data(), Handle(), CHECK);

0 commit comments

Comments
 (0)