From 6fdc9ba8a3133d79f1a5dd2eefd7d20855617706 Mon Sep 17 00:00:00 2001
From: mchung <unknown>
Date: Mon, 28 Jan 2013 15:53:29 -0800
Subject: [PATCH] 8006882: Proxy generated classes in sun.proxy package breaks
 JMockit Reviewed-by: alanb, ahgross

---
 src/share/classes/java/lang/reflect/Proxy.java      | 2 +-
 src/share/classes/sun/reflect/misc/ReflectUtil.java | 4 +++-
 src/share/lib/security/java.security-linux          | 2 ++
 src/share/lib/security/java.security-macosx         | 2 ++
 src/share/lib/security/java.security-solaris        | 2 ++
 src/share/lib/security/java.security-windows        | 2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/share/classes/java/lang/reflect/Proxy.java b/src/share/classes/java/lang/reflect/Proxy.java
index 5e0c31f2d..e946ba322 100644
--- a/src/share/classes/java/lang/reflect/Proxy.java
+++ b/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/src/share/classes/sun/reflect/misc/ReflectUtil.java b/src/share/classes/sun/reflect/misc/ReflectUtil.java
index 84ab06b08..0640d92e5 100644
--- a/src/share/classes/sun/reflect/misc/ReflectUtil.java
+++ b/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/src/share/lib/security/java.security-linux b/src/share/lib/security/java.security-linux
index cdda1b476..c37bb480e 100644
--- a/src/share/lib/security/java.security-linux
+++ b/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/src/share/lib/security/java.security-macosx b/src/share/lib/security/java.security-macosx
index 515141de8..ffb99c069 100644
--- a/src/share/lib/security/java.security-macosx
+++ b/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/src/share/lib/security/java.security-solaris b/src/share/lib/security/java.security-solaris
index 2cccc0d45..4236643f5 100644
--- a/src/share/lib/security/java.security-solaris
+++ b/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/src/share/lib/security/java.security-windows b/src/share/lib/security/java.security-windows
index b6281f741..89ec56786 100644
--- a/src/share/lib/security/java.security-windows
+++ b/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.,\
-- 
GitLab