src/share/vm/classfile/systemDictionary.cpp

*** 873,883 ****
    // UseNewReflection
    // The result of this call should be consistent with the result
    // of the call to resolve_instance_class_or_null().
    // See evaluation 6790209 and 4474172 for more details.
    class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader()));
!   ClassLoaderData* loader_data = register_loader(class_loader, CHECK_NULL);
  
    unsigned int d_hash = dictionary()->compute_hash(class_name, loader_data);
    int d_index = dictionary()->hash_to_index(d_hash);
  
    {
--- 873,889 ----
    // UseNewReflection
    // The result of this call should be consistent with the result
    // of the call to resolve_instance_class_or_null().
    // See evaluation 6790209 and 4474172 for more details.
    class_loader = Handle(THREAD, java_lang_ClassLoader::non_reflection_class_loader(class_loader()));
!   ClassLoaderData* loader_data = ClassLoaderData::class_loader_data_or_null(class_loader());
! 
!   if (loader_data == NULL) {
!     // If the ClassLoaderData has not been setup,
!     // then the class loader has no entries in the dictionary.
!     return NULL;
!   }
    
    unsigned int d_hash = dictionary()->compute_hash(class_name, loader_data);
    int d_index = dictionary()->hash_to_index(d_hash);
  
    {