提交 524ad4c1 编写于 作者: C coleenp

8058927: ATG throws ClassNotFoundException

Summary: ClassLoader for array klass set to null and not the class loader of the component type.
Reviewed-by: dcubed, ctornqvi
上级 ce3f50a6
...@@ -625,6 +625,7 @@ void java_lang_Class::create_mirror(KlassHandle k, Handle class_loader, ...@@ -625,6 +625,7 @@ void java_lang_Class::create_mirror(KlassHandle k, Handle class_loader,
} }
// set the classLoader field in the java_lang_Class instance // set the classLoader field in the java_lang_Class instance
assert(class_loader() == k->class_loader(), "should be same");
set_class_loader(mirror(), class_loader()); set_class_loader(mirror(), class_loader());
// Setup indirection from klass->mirror last // Setup indirection from klass->mirror last
......
...@@ -93,7 +93,7 @@ void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_kl ...@@ -93,7 +93,7 @@ void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_kl
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
k->initialize_supers(super_klass(), CHECK); k->initialize_supers(super_klass(), CHECK);
k->vtable()->initialize_vtable(false, CHECK); k->vtable()->initialize_vtable(false, CHECK);
java_lang_Class::create_mirror(k, Handle(NULL), Handle(NULL), CHECK); java_lang_Class::create_mirror(k, Handle(THREAD, k->class_loader()), Handle(NULL), CHECK);
} }
GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) { GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) {
......
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @key regression
* @bug 8058927
* @summary Make sure array class has the right class loader
* @run main ShowClassLoader
*/
public class ShowClassLoader {
public static void main(String[] args) {
Object[] oa = new Object[0];
ShowClassLoader[] sa = new ShowClassLoader[0];
System.out.println("Classloader for Object[] is " + oa.getClass().getClassLoader());
System.out.println("Classloader for SCL[] is " + sa.getClass().getClassLoader() );
if (sa.getClass().getClassLoader() == null) {
throw new RuntimeException("Wrong class loader");
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册