Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 5777:cbbb166b38eb jdk7u13-b10
8006882: Proxy generated classes in sun.proxy package breaks JMockit
Reviewed-by: alanb, ahgross
| author | mchung |
|---|---|
| date | Mon, 28 Jan 2013 15:15:10 -0800 |
| parents | 044ea56a339d |
| children | 28700a56b69d |
| files | src/share/classes/java/lang/reflect/Proxy.java src/share/classes/sun/reflect/misc/ReflectUtil.java src/share/lib/security/java.security src/share/lib/security/java.security-macosx src/share/lib/security/java.security-solaris src/share/lib/security/java.security-windows |
| diffstat | 6 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/lang/reflect/Proxy.java Mon Jan 28 15:08:21 2013 -0800 +++ b/src/share/classes/java/lang/reflect/Proxy.java Mon Jan 28 15:15:10 2013 -0800 @@ -609,7 +609,7 @@ } 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 + "."; }
--- a/src/share/classes/sun/reflect/misc/ReflectUtil.java Mon Jan 28 15:08:21 2013 -0800 +++ b/src/share/classes/sun/reflect/misc/ReflectUtil.java Mon Jan 28 15:15:10 2013 -0800 @@ -202,5 +202,5 @@ } } - public static final String PROXY_PACKAGE = "sun.proxy"; + public static final String PROXY_PACKAGE = "com.sun.proxy"; }
--- a/src/share/lib/security/java.security Mon Jan 28 15:08:21 2013 -0800 +++ b/src/share/lib/security/java.security Mon Jan 28 15:15:10 2013 -0800 @@ -130,6 +130,7 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ com.sun.jmx.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ @@ -152,6 +153,7 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ com.sun.jmx.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\
--- a/src/share/lib/security/java.security-macosx Mon Jan 28 15:08:21 2013 -0800 +++ b/src/share/lib/security/java.security-macosx Mon Jan 28 15:15:10 2013 -0800 @@ -131,6 +131,7 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ com.sun.jmx.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ @@ -154,6 +155,7 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ com.sun.jmx.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\
--- a/src/share/lib/security/java.security-solaris Mon Jan 28 15:08:21 2013 -0800 +++ b/src/share/lib/security/java.security-solaris Mon Jan 28 15:15:10 2013 -0800 @@ -132,6 +132,7 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ com.sun.jmx.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ @@ -154,6 +155,7 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ com.sun.jmx.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\
--- a/src/share/lib/security/java.security-windows Mon Jan 28 15:08:21 2013 -0800 +++ b/src/share/lib/security/java.security-windows Mon Jan 28 15:15:10 2013 -0800 @@ -131,6 +131,7 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ com.sun.jmx.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\ @@ -153,6 +154,7 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ com.sun.jmx.,\ + com.sun.proxy.,\ com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.glassfish.external.,\