< prev index next >

src/hotspot/share/classfile/classLoaderData.inline.hpp

Print this page

        

*** 44,54 **** inline ClassLoaderData* ClassLoaderData::class_loader_data_or_null(oop loader) { if (loader == NULL) { return ClassLoaderData::the_null_class_loader_data(); } ! return java_lang_ClassLoader::loader_data(loader); } inline ClassLoaderData* ClassLoaderData::class_loader_data(oop loader) { ClassLoaderData* loader_data = class_loader_data_or_null(loader); assert(loader_data != NULL, "Must be"); --- 44,54 ---- inline ClassLoaderData* ClassLoaderData::class_loader_data_or_null(oop loader) { if (loader == NULL) { return ClassLoaderData::the_null_class_loader_data(); } ! return java_lang_ClassLoader::loader_data_acquire(loader); } inline ClassLoaderData* ClassLoaderData::class_loader_data(oop loader) { ClassLoaderData* loader_data = class_loader_data_or_null(loader); assert(loader_data != NULL, "Must be");
*** 58,68 **** inline ClassLoaderData *ClassLoaderDataGraph::find_or_create(Handle loader) { guarantee(loader() != NULL && oopDesc::is_oop(loader()), "Loader must be oop"); // Gets the class loader data out of the java/lang/ClassLoader object, if non-null // it's already in the loader_data, so no need to add ! ClassLoaderData* loader_data= java_lang_ClassLoader::loader_data(loader()); if (loader_data) { return loader_data; } return ClassLoaderDataGraph::add(loader, false); } --- 58,68 ---- inline ClassLoaderData *ClassLoaderDataGraph::find_or_create(Handle loader) { guarantee(loader() != NULL && oopDesc::is_oop(loader()), "Loader must be oop"); // Gets the class loader data out of the java/lang/ClassLoader object, if non-null // it's already in the loader_data, so no need to add ! ClassLoaderData* loader_data= java_lang_ClassLoader::loader_data_acquire(loader()); if (loader_data) { return loader_data; } return ClassLoaderDataGraph::add(loader, false); }
< prev index next >