diff --git a/jdk/src/share/classes/java/lang/reflect/Proxy.java b/jdk/src/share/classes/java/lang/reflect/Proxy.java index 5e0c31f2de0..e946ba3226d 100644 --- a/jdk/src/share/classes/java/lang/reflect/Proxy.java +++ b/jdk/src/share/classes/java/lang/reflect/Proxy.java @@ -609,7 +609,7 @@ public class Proxy implements java.io.Serializable { } if (proxyPkg == null) { - // if no non-public proxy interfaces, use sun.proxy package + // if no non-public proxy interfaces, use com.sun.proxy package proxyPkg = ReflectUtil.PROXY_PACKAGE + "."; } diff --git a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java index 84ab06b080a..0640d92e5d0 100644 --- a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java +++ b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java @@ -202,5 +202,7 @@ public final class ReflectUtil { } } - public static final String PROXY_PACKAGE = "sun.proxy"; + // Note that bytecode instrumentation tools may exclude 'sun.*' + // classes but not generated proxy classes and so keep it in com.sun.* + public static final String PROXY_PACKAGE = "com.sun.proxy"; } diff --git a/jdk/src/share/lib/security/java.security-linux b/jdk/src/share/lib/security/java.security-linux index cdda1b47699..c37bb480eb6 100644 --- a/jdk/src/share/lib/security/java.security-linux +++ b/jdk/src/share/lib/security/java.security-linux @@ -153,6 +153,7 @@ package.access=sun.,\ com.sun.istack.internal.,\ com.sun.jmx.defaults.,\ com.sun.jmx.remote.util.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ @@ -177,6 +178,7 @@ package.definition=sun.,\ com.sun.istack.internal.,\ com.sun.jmx.defaults.,\ com.sun.jmx.remote.util.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx index 515141de81b..ffb99c06936 100644 --- a/jdk/src/share/lib/security/java.security-macosx +++ b/jdk/src/share/lib/security/java.security-macosx @@ -154,6 +154,7 @@ package.access=sun.,\ com.sun.istack.internal.,\ com.sun.jmx.defaults.,\ com.sun.jmx.remote.util.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ @@ -179,6 +180,7 @@ package.definition=sun.,\ com.sun.istack.internal.,\ com.sun.jmx.defaults.,\ com.sun.jmx.remote.util.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris index 2cccc0d455b..4236643f55e 100644 --- a/jdk/src/share/lib/security/java.security-solaris +++ b/jdk/src/share/lib/security/java.security-solaris @@ -155,6 +155,7 @@ package.access=sun.,\ com.sun.istack.internal.,\ com.sun.jmx.defaults.,\ com.sun.jmx.remote.util.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ @@ -179,6 +180,7 @@ package.definition=sun.,\ com.sun.istack.internal.,\ com.sun.jmx.defaults.,\ com.sun.jmx.remote.util.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows index b6281f741a1..89ec5678646 100644 --- a/jdk/src/share/lib/security/java.security-windows +++ b/jdk/src/share/lib/security/java.security-windows @@ -154,6 +154,7 @@ package.access=sun.,\ com.sun.istack.internal.,\ com.sun.jmx.defaults.,\ com.sun.jmx.remote.util.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ @@ -178,6 +179,7 @@ package.definition=sun.,\ com.sun.istack.internal.,\ com.sun.jmx.defaults.,\ com.sun.jmx.remote.util.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\