infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-03 12:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8076397: Better MBean connections

Browse Source 
Reviewed-by: dfuchs, ahgross
This commit is contained in:
Jaroslav Bachorik 2015-04-01 17:30:28 +02:00
parent 1849df6c27
commit 97a263953b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/java.management/share/classes/javax/management/MBeanServerInvocationHandler.java
View File

@ -141,6 +141,12 @@ public class MBeanServerInvocationHandler implements InvocationHandler {
if (connection == null) {
throw new IllegalArgumentException("Null connection");
}
// if (Proxy.isProxyClass(connection.getClass())) {
// if (MBeanServerInvocationHandler.class.isAssignableFrom(
// Proxy.getInvocationHandler(connection).getClass())) {
// throw new IllegalArgumentException("Wrapping MBeanServerInvocationHandler");
// }
// }
if (objectName == null) {
throw new IllegalArgumentException("Null object name");
}
@ -418,6 +424,10 @@ public class MBeanServerInvocationHandler implements InvocationHandler {
new Class<?>[] {Object.class})
&& isLocal(proxy, method))
return true;
// if (methodName.equals("finalize")
// && method.getParameterTypes().length == 0) {
// return true;
// }
return false;
}
@ -453,6 +463,9 @@ public class MBeanServerInvocationHandler implements InvocationHandler {
connection + "[" + objectName + "])";
} else if (methodName.equals("hashCode")) {
return objectName.hashCode()+connection.hashCode();
} else if (methodName.equals("finalize")) {
// ignore the finalizer invocation via proxy
return null;
}
throw new RuntimeException("Unexpected method name: " + methodName);