equal
deleted
inserted
replaced
602 assert(name != NULL && !FieldType::is_array(name) && |
602 assert(name != NULL && !FieldType::is_array(name) && |
603 !FieldType::is_obj(name), "invalid class name"); |
603 !FieldType::is_obj(name), "invalid class name"); |
604 |
604 |
605 Ticks class_load_start_time = Ticks::now(); |
605 Ticks class_load_start_time = Ticks::now(); |
606 |
606 |
607 // UseNewReflection |
|
608 // Fix for 4474172; see evaluation for more details |
607 // Fix for 4474172; see evaluation for more details |
609 class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader())); |
608 class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader())); |
610 ClassLoaderData *loader_data = register_loader(class_loader, CHECK_NULL); |
609 ClassLoaderData *loader_data = register_loader(class_loader, CHECK_NULL); |
611 |
610 |
612 // Do lookup to see if class already exist and the protection domain |
611 // Do lookup to see if class already exist and the protection domain |
896 Klass* SystemDictionary::find(Symbol* class_name, |
895 Klass* SystemDictionary::find(Symbol* class_name, |
897 Handle class_loader, |
896 Handle class_loader, |
898 Handle protection_domain, |
897 Handle protection_domain, |
899 TRAPS) { |
898 TRAPS) { |
900 |
899 |
901 // UseNewReflection |
|
902 // The result of this call should be consistent with the result |
900 // The result of this call should be consistent with the result |
903 // of the call to resolve_instance_class_or_null(). |
901 // of the call to resolve_instance_class_or_null(). |
904 // See evaluation 6790209 and 4474172 for more details. |
902 // See evaluation 6790209 and 4474172 for more details. |
905 class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader())); |
903 class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader())); |
906 ClassLoaderData* loader_data = ClassLoaderData::class_loader_data_or_null(class_loader()); |
904 ClassLoaderData* loader_data = ClassLoaderData::class_loader_data_or_null(class_loader()); |