提交 6fdc9ba8 编写于 作者: M mchung

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

Reviewed-by: alanb, ahgross
上级 2b4a508f
...@@ -609,7 +609,7 @@ public class Proxy implements java.io.Serializable { ...@@ -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 + ".";
} }
......
...@@ -202,5 +202,7 @@ public final class ReflectUtil { ...@@ -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";
} }
...@@ -153,6 +153,7 @@ package.access=sun.,\ ...@@ -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.,\ ...@@ -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.,\
......
...@@ -154,6 +154,7 @@ package.access=sun.,\ ...@@ -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.,\ ...@@ -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.,\
......
...@@ -155,6 +155,7 @@ package.access=sun.,\ ...@@ -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.,\ ...@@ -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.,\
......
...@@ -154,6 +154,7 @@ package.access=sun.,\ ...@@ -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.,\ ...@@ -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.,\
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册