Mercurial > hg > release > icedtea7-forest-2.5 > jdk
changeset 7695:d5353f8e1e02 jdk7u65-b08
8032585: JSR292: IllegalAccessError when attempting to invoke protected method from different package
Reviewed-by: twisti
author | kizune |
---|---|
date | Mon, 14 Apr 2014 13:48:47 +0400 |
parents | fbe9320339ea |
children | ee0cedc50d32 473400607e72 fc87b55d62fc |
files | src/share/classes/sun/invoke/util/VerifyAccess.java test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java |
diffstat | 4 files changed, 103 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/invoke/util/VerifyAccess.java Fri Feb 07 16:00:49 2014 +0400 +++ b/src/share/classes/sun/invoke/util/VerifyAccess.java Mon Apr 14 13:48:47 2014 +0400 @@ -117,7 +117,7 @@ isSamePackage(defc, lookupClass)) return true; if ((allowedModes & PROTECTED) != 0 && - isPublicSuperClass(defc, lookupClass)) + isSuperClass(defc, lookupClass)) return true; return false; case PACKAGE_ONLY: // That is, zero. Unmarked member is package-only access. @@ -139,8 +139,8 @@ lookupClass.isAssignableFrom(refc)); } - static boolean isPublicSuperClass(Class<?> defc, Class<?> lookupClass) { - return isPublic(defc.getModifiers()) && defc.isAssignableFrom(lookupClass); + static boolean isSuperClass(Class<?> defc, Class<?> lookupClass) { + return defc.isAssignableFrom(lookupClass); } /**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java Mon Apr 14 13:48:47 2014 +0400 @@ -0,0 +1,33 @@ +/* + * 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 + * @bug 8032585 + * @summary JSR292: IllegalAccessError when attempting to invoke protected method from different package + * + * @compile p1/T2.java p2/T3.java + * @run main/othervm p2.T3 + */ +public class Test {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java Mon Apr 14 13:48:47 2014 +0400 @@ -0,0 +1,30 @@ +/* + * 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. + * + */ +package p1; + +class T1 { + protected void m() { System.out.println("T1.m");} +} + +public class T2 extends T1 {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java Mon Apr 14 13:48:47 2014 +0400 @@ -0,0 +1,37 @@ +/* + * 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. + * + */ +package p2; + +import p1.T2; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; + +public class T3 extends T2 { + public static void main(String[] args) throws Throwable { + MethodHandles.lookup().findVirtual(T3.class, "m", MethodType.methodType(void.class)); + System.out.println("TEST PASSED"); + } +}