jdk-sandbox: comparison jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java

equal deleted inserted replaced

-:a9a142fcf1b5
+:bbc2d15aaf7a
 /*
-* Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Sun designates this
 * have any questions.
 */
 package com.sun.jmx.mbeanserver;
-import java.util.Iterator;
+import static com.sun.jmx.defaults.JmxProperties.MBEANSERVER_LOGGER;
-import java.util.logging.Level;
+import com.sun.jmx.interceptor.NamespaceDispatchInterceptor;
-import java.util.Set;
 import java.io.ObjectInputStream;
 import java.security.AccessController;
 import java.security.Permission;
 import java.security.PrivilegedExceptionAction;
+import java.util.Iterator;
-// RI import
+import java.util.Set;
-import javax.management.MBeanPermission;
+import java.util.logging.Level;
-import javax.management.AttributeNotFoundException;
-import javax.management.MBeanException;
-import javax.management.ReflectionException;
-import javax.management.MBeanInfo;
-import javax.management.QueryExp;
-import javax.management.NotificationListener;
-import javax.management.NotificationFilter;
-import javax.management.ListenerNotFoundException;
-import javax.management.IntrospectionException;
-import javax.management.OperationsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.MBeanRegistrationException;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InvalidAttributeValueException;
-import javax.management.ObjectName;
-import javax.management.ObjectInstance;
 import javax.management.Attribute;
 import javax.management.AttributeList;
-import javax.management.RuntimeOperationsException;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.IntrospectionException;
+import javax.management.InvalidAttributeValueException;
+import javax.management.ListenerNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanPermission;
+import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerDelegate;
+import javax.management.NotCompliantMBeanException;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
+import javax.management.OperationsException;
+import javax.management.QueryExp;
+import javax.management.ReflectionException;
+import javax.management.RuntimeOperationsException;
 import javax.management.loading.ClassLoaderRepository;
-import static com.sun.jmx.defaults.JmxProperties.MBEANSERVER_LOGGER;
-import com.sun.jmx.interceptor.DefaultMBeanServerInterceptor;
-import com.sun.jmx.interceptor.MBeanServerInterceptor;
 /**
 * This is the base class for MBean manipulation on the agent side. It
 * contains the methods necessary for the creation, registration, and
 * deletion of MBeans as well as the access methods for registered MBeans.
 private final SecureClassLoaderRepository secureClr;
 /** true if interceptors are enabled **/
 private final boolean interceptorsEnabled;
-/** Revisit: transient ??? **/
+private final MBeanServer outerShell;
-private final transient MBeanServer outerShell;
+private volatile MBeanServer mbsInterceptor = null;
-/** Revisit: transient ??? **/
-private transient MBeanServerInterceptor mbsInterceptor = null;
-/** Revisit: transient ??? **/
 /** The MBeanServerDelegate object representing the MBean Server */
-private final transient MBeanServerDelegate mBeanServerDelegateObject;
+private final MBeanServerDelegate mBeanServerDelegateObject;
+private final String mbeanServerName;
 /**
 * <b>Package:</b> Creates an MBeanServer with the
 * specified default domain name, outer interface, and delegate.
 * <p>The default domain name is used as the domain part in the ObjectName
 this.mBeanServerDelegateObject = delegate;
 this.outerShell   = outer;
 final Repository repository = new Repository(domain,fairLock);
 this.mbsInterceptor =
-new DefaultMBeanServerInterceptor(outer, delegate, instantiator,
+new NamespaceDispatchInterceptor(outer, delegate, instantiator,
 repository);
 this.interceptorsEnabled = interceptors;
+this.mbeanServerName = Util.getMBeanServerSecurityName(delegate);
 initialize();
 }
 /**
 * Tell whether {@link MBeanServerInterceptor}s are enabled on this
 */
 public Object instantiate(String className)
 throws ReflectionException, MBeanException {
 /* Permission check */
-checkMBeanPermission(className, null, null, "instantiate");
+checkMBeanPermission(mbeanServerName, className, null, null,
+"instantiate");
 return instantiator.instantiate(className);
 }
 /**
 public Object instantiate(String className, ObjectName loaderName)
 throws ReflectionException, MBeanException,
 InstanceNotFoundException {
 /* Permission check */
-checkMBeanPermission(className, null, null, "instantiate");
+checkMBeanPermission(mbeanServerName, className, null,
+null, "instantiate");
 ClassLoader myLoader = outerShell.getClass().getClassLoader();
 return instantiator.instantiate(className, loaderName, myLoader);
 }
 public Object instantiate(String className, Object params[],
 String signature[])
 throws ReflectionException, MBeanException {
 /* Permission check */
-checkMBeanPermission(className, null, null, "instantiate");
+checkMBeanPermission(mbeanServerName, className, null, null,
+"instantiate");
 ClassLoader myLoader = outerShell.getClass().getClassLoader();
 return instantiator.instantiate(className, params, signature,
 myLoader);
 }
 Object params[], String signature[])
 throws ReflectionException, MBeanException,
 InstanceNotFoundException {
 /* Permission check */
-checkMBeanPermission(className, null, null, "instantiate");
+checkMBeanPermission(mbeanServerName, className, null,
+null, "instantiate");
 ClassLoader myLoader = outerShell.getClass().getClassLoader();
 return instantiator.instantiate(className,loaderName,params,signature,
 myLoader);
 }
 MBEANSERVER_LOGGER.logp(Level.FINEST,
 JmxMBeanServer.class.getName(), "initialize",
 "Unexpected exception occurred", e);
 }
 throw new
-IllegalStateException("Can't register delegate.");
+IllegalStateException("Can't register delegate.",e);
 }
 /* Add my class loader to the repository
 This can be null if my class loader is the bootstrap
 * @exception UnsupportedOperationException if
 *            {@link MBeanServerInterceptor}s
 *            are not enabled on this object.
 * @see #interceptorsEnabled
 **/
-public synchronized MBeanServerInterceptor getMBeanServerInterceptor() {
+public synchronized MBeanServer getMBeanServerInterceptor() {
 if (interceptorsEnabled) return mbsInterceptor;
 else throw new UnsupportedOperationException(
 "MBeanServerInterceptors are disabled.");
 }
 *            {@link MBeanServerInterceptor}s
 *            are not enabled on this object.
 * @see #interceptorsEnabled
 **/
 public synchronized void
-setMBeanServerInterceptor(MBeanServerInterceptor interceptor) {
+setMBeanServerInterceptor(MBeanServer interceptor) {
 if (!interceptorsEnabled) throw new UnsupportedOperationException(
 "MBeanServerInterceptors are disabled.");
 if (interceptor == null) throw new
 IllegalArgumentException("MBeanServerInterceptor is null");
 mbsInterceptor = interceptor;
 * <p>Return the ClassLoaderRepository for that MBeanServer.
 * @return The ClassLoaderRepository for that MBeanServer.
 **/
 public ClassLoaderRepository getClassLoaderRepository() {
 /* Permission check */
-checkMBeanPermission(null, null, null, "getClassLoaderRepository");
+checkMBeanPermission(mbeanServerName, null, null,
+null, "getClassLoaderRepository");
 return secureClr;
 }
 public MBeanServerDelegate getMBeanServerDelegate() {
 if (!interceptorsEnabled) throw new UnsupportedOperationException(
 }
 // SECURITY CHECKS
 //----------------
-private static void checkMBeanPermission(String classname,
+private static void checkMBeanPermission(String serverName,
+String classname,
 String member,
 ObjectName objectName,
 String actions)
 throws SecurityException {
 SecurityManager sm = System.getSecurityManager();
 if (sm != null) {
-Permission perm = new MBeanPermission(classname,
+Permission perm = new MBeanPermission(serverName,
+classname,
 member,
 objectName,
 actions);
 sm.checkPermission(perm);
 }

changeset 1156	bbc2d15aaf7a
parent 2	90ce3da70b43
child 1510	e747d3193ef2