archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8207027: Lookup.accessClass fails for an array type in the same package when assertions are enabled

Browse source 
Reviewed-by: redestad, mchung
This commit is contained in:
Paul Sandoz 2018-07-11 15:35:47 -07:00
parent 8a9b0134a8
commit d808684592
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/java.base/share/classes/sun/invoke/util/VerifyAccess.java
View file

@ -333,7 +333,6 @@ public class VerifyAccess {
* @return whether they are in the same package * @return whether they are in the same package
*/ */
public static boolean isSamePackage(Class<?> class1, Class<?> class2) { public static boolean isSamePackage(Class<?> class1, Class<?> class2) {
assert(!class1.isArray() && !class2.isArray());
if (class1 == class2) if (class1 == class2)
return true; return true;
if (class1.getClassLoader() != class2.getClassLoader()) if (class1.getClassLoader() != class2.getClassLoader())

11
test/jdk/java/lang/invoke/t8150782/TestAccessClass.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,6 +24,7 @@
*/ */
/* @test /* @test
* @bug 8150782 8207027
* @compile TestAccessClass.java TestCls.java * @compile TestAccessClass.java TestCls.java
* @run testng/othervm -ea -esa test.java.lang.invoke.t8150782.TestAccessClass * @run testng/othervm -ea -esa test.java.lang.invoke.t8150782.TestAccessClass
*/ */
@ -54,11 +55,17 @@ public class TestAccessClass {
} }
@Test @Test
public void returnsSameClass() throws IllegalAccessException, ClassNotFoundException { public void returnsSameClassInSamePackage() throws IllegalAccessException, ClassNotFoundException {
Class<?> aClass = lookup().accessClass(Class1.class); Class<?> aClass = lookup().accessClass(Class1.class);
assertEquals(Class1.class, aClass); assertEquals(Class1.class, aClass);
} }
@Test
public void returnsSameArrayClassInSamePackage() throws IllegalAccessException, ClassNotFoundException {
Class<?> aClass = lookup().accessClass(Class1[].class);
assertEquals(Class1[].class, aClass);
}
@DataProvider @DataProvider
Object[][] illegalAccessAccess() { Object[][] illegalAccessAccess() {
return new Object[][] { return new Object[][] {

11
test/jdk/java/lang/invoke/t8150782/TestFindClass.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -24,6 +24,7 @@
*/ */
/* @test /* @test
* @bug 8150782 8207027
* @compile TestFindClass.java TestCls.java * @compile TestFindClass.java TestCls.java
* @run testng/othervm -ea -esa test.java.lang.invoke.t8150782.TestFindClass * @run testng/othervm -ea -esa test.java.lang.invoke.t8150782.TestFindClass
*/ */
@ -56,11 +57,17 @@ public class TestFindClass {
} }
@Test @Test
public void returnsRequestedClass() throws IllegalAccessException, ClassNotFoundException { public void returnsRequestedClassInSamePackage() throws IllegalAccessException, ClassNotFoundException {
Class<?> aClass = lookup().findClass(PACKAGE_PREFIX + "TestFindClass$Class1"); Class<?> aClass = lookup().findClass(PACKAGE_PREFIX + "TestFindClass$Class1");
assertEquals(Class1.class, aClass); assertEquals(Class1.class, aClass);
} }
@Test
public void returnsRequestedArrayClassInSamePackage() throws IllegalAccessException, ClassNotFoundException {
Class<?> aClass = lookup().findClass("[L" + PACKAGE_PREFIX + "TestFindClass$Class1;");
assertEquals(Class1[].class, aClass);
}
@Test(expectedExceptions = {ClassNotFoundException.class}) @Test(expectedExceptions = {ClassNotFoundException.class})
public void classNotFoundExceptionTest() throws IllegalAccessException, ClassNotFoundException { public void classNotFoundExceptionTest() throws IllegalAccessException, ClassNotFoundException {
lookup().findClass(PACKAGE_PREFIX + "TestFindClass$NonExistent"); lookup().findClass(PACKAGE_PREFIX + "TestFindClass$NonExistent");