8006882: Proxy generated classes in sun.proxy package breaks JMockit

Reviewed-by: alanb, ahgross
This commit is contained in:
Mandy Chung 2013-01-28 15:53:29 -08:00
parent 11036fb4d5
commit 7cb8f824d3
6 changed files with 12 additions and 2 deletions

View File

@ -609,7 +609,7 @@ public class Proxy implements java.io.Serializable {
} }
if (proxyPkg == null) { 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 + "."; proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
} }

View File

@ -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";
} }

View File

@ -153,6 +153,7 @@ package.access=sun.,\
com.sun.istack.internal.,\ com.sun.istack.internal.,\
com.sun.jmx.defaults.,\ com.sun.jmx.defaults.,\
com.sun.jmx.remote.util.,\ com.sun.jmx.remote.util.,\
com.sun.proxy.,\
com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xerces.internal.utils.,\
com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\
com.sun.org.glassfish.external.,\ com.sun.org.glassfish.external.,\
@ -177,6 +178,7 @@ package.definition=sun.,\
com.sun.istack.internal.,\ com.sun.istack.internal.,\
com.sun.jmx.defaults.,\ com.sun.jmx.defaults.,\
com.sun.jmx.remote.util.,\ com.sun.jmx.remote.util.,\
com.sun.proxy.,\
com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xerces.internal.utils.,\
com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\
com.sun.org.glassfish.external.,\ com.sun.org.glassfish.external.,\

View File

@ -154,6 +154,7 @@ package.access=sun.,\
com.sun.istack.internal.,\ com.sun.istack.internal.,\
com.sun.jmx.defaults.,\ com.sun.jmx.defaults.,\
com.sun.jmx.remote.util.,\ com.sun.jmx.remote.util.,\
com.sun.proxy.,\
com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xerces.internal.utils.,\
com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\
com.sun.org.glassfish.external.,\ com.sun.org.glassfish.external.,\
@ -179,6 +180,7 @@ package.definition=sun.,\
com.sun.istack.internal.,\ com.sun.istack.internal.,\
com.sun.jmx.defaults.,\ com.sun.jmx.defaults.,\
com.sun.jmx.remote.util.,\ com.sun.jmx.remote.util.,\
com.sun.proxy.,\
com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xerces.internal.utils.,\
com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\
com.sun.org.glassfish.external.,\ com.sun.org.glassfish.external.,\

View File

@ -155,6 +155,7 @@ package.access=sun.,\
com.sun.istack.internal.,\ com.sun.istack.internal.,\
com.sun.jmx.defaults.,\ com.sun.jmx.defaults.,\
com.sun.jmx.remote.util.,\ com.sun.jmx.remote.util.,\
com.sun.proxy.,\
com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xerces.internal.utils.,\
com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\
com.sun.org.glassfish.external.,\ com.sun.org.glassfish.external.,\
@ -179,6 +180,7 @@ package.definition=sun.,\
com.sun.istack.internal.,\ com.sun.istack.internal.,\
com.sun.jmx.defaults.,\ com.sun.jmx.defaults.,\
com.sun.jmx.remote.util.,\ com.sun.jmx.remote.util.,\
com.sun.proxy.,\
com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xerces.internal.utils.,\
com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\
com.sun.org.glassfish.external.,\ com.sun.org.glassfish.external.,\

View File

@ -154,6 +154,7 @@ package.access=sun.,\
com.sun.istack.internal.,\ com.sun.istack.internal.,\
com.sun.jmx.defaults.,\ com.sun.jmx.defaults.,\
com.sun.jmx.remote.util.,\ com.sun.jmx.remote.util.,\
com.sun.proxy.,\
com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xerces.internal.utils.,\
com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\
com.sun.org.glassfish.external.,\ com.sun.org.glassfish.external.,\
@ -178,6 +179,7 @@ package.definition=sun.,\
com.sun.istack.internal.,\ com.sun.istack.internal.,\
com.sun.jmx.defaults.,\ com.sun.jmx.defaults.,\
com.sun.jmx.remote.util.,\ com.sun.jmx.remote.util.,\
com.sun.proxy.,\
com.sun.org.apache.xerces.internal.utils.,\ com.sun.org.apache.xerces.internal.utils.,\
com.sun.org.apache.xalan.internal.utils.,\ com.sun.org.apache.xalan.internal.utils.,\
com.sun.org.glassfish.external.,\ com.sun.org.glassfish.external.,\