Skip to content

Commit 88af204

Browse files
committed
8292494: Ensure SystemDictionary::set_platform_loader and set_system_loader are called only once
Reviewed-by: iklam, dholmes
1 parent 8d3d439 commit 88af204

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/hotspot/share/classfile/systemDictionary.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,14 @@ ClassLoaderData* SystemDictionary::register_loader(Handle class_loader, bool cre
198198
}
199199

200200
void SystemDictionary::set_system_loader(ClassLoaderData *cld) {
201-
if (_java_system_loader.is_empty()) {
202-
_java_system_loader = cld->class_loader_handle();
203-
}
201+
assert(_java_system_loader.is_empty(), "already set!");
202+
_java_system_loader = cld->class_loader_handle();
203+
204204
}
205205

206206
void SystemDictionary::set_platform_loader(ClassLoaderData *cld) {
207-
if (_java_platform_loader.is_empty()) {
208-
_java_platform_loader = cld->class_loader_handle();
209-
}
207+
assert(_java_platform_loader.is_empty(), "already set!");
208+
_java_platform_loader = cld->class_loader_handle();
210209
}
211210

212211
// ----------------------------------------------------------------------------

0 commit comments

Comments
 (0)