changeset 7994:de419ea8ed8f

8006882: Proxy generated classes in sun.proxy package breaks JMockit Reviewed-by: alanb, ahgross
author mchung
date Mon, 28 Jan 2013 15:53:29 -0800
parents 12491fa16985
children 8effe3b7489d
files src/share/classes/java/lang/reflect/Proxy.java src/share/classes/sun/reflect/misc/ReflectUtil.java src/share/lib/security/java.security-linux 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, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/lang/reflect/Proxy.java	Tue Feb 05 15:35:35 2013 +0100
+++ b/src/share/classes/java/lang/reflect/Proxy.java	Mon Jan 28 15:53:29 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	Tue Feb 05 15:35:35 2013 +0100
+++ b/src/share/classes/sun/reflect/misc/ReflectUtil.java	Mon Jan 28 15:53:29 2013 -0800
@@ -202,5 +202,7 @@
         }
     }
 
-    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";
 }
--- a/src/share/lib/security/java.security-linux	Tue Feb 05 15:35:35 2013 +0100
+++ b/src/share/lib/security/java.security-linux	Mon Jan 28 15:53:29 2013 -0800
@@ -153,6 +153,7 @@
                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 @@
                    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.,\
--- a/src/share/lib/security/java.security-macosx	Tue Feb 05 15:35:35 2013 +0100
+++ b/src/share/lib/security/java.security-macosx	Mon Jan 28 15:53:29 2013 -0800
@@ -154,6 +154,7 @@
                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 @@
                    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.,\
--- a/src/share/lib/security/java.security-solaris	Tue Feb 05 15:35:35 2013 +0100
+++ b/src/share/lib/security/java.security-solaris	Mon Jan 28 15:53:29 2013 -0800
@@ -155,6 +155,7 @@
                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 @@
                    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.,\
--- a/src/share/lib/security/java.security-windows	Tue Feb 05 15:35:35 2013 +0100
+++ b/src/share/lib/security/java.security-windows	Mon Jan 28 15:53:29 2013 -0800
@@ -154,6 +154,7 @@
                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 @@
                    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.,\