[jboss-remoting-commits] JBoss Remoting SVN: r3938 - remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2008-04-11 21:00:20 -0400 (Fri, 11 Apr 2008)
New Revision: 3938

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util/DetectorUtil.java
Log:
JBREM-934: Replaced AccessController.doPrivileged() calls with SecurityUtility calls..

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util/DetectorUtil.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util/DetectorUtil.java	2008-04-12 00:59:32 UTC (rev 3937)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/detection/util/DetectorUtil.java	2008-04-12 01:00:20 UTC (rev 3938)
@@ -37,7 +37,7 @@
 import org.jboss.remoting.network.NetworkInstance;
 import org.jboss.remoting.network.NetworkRegistry;
 import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.util.SystemUtility;
+import org.jboss.remoting.util.SecurityUtility;
 
 
 /**
@@ -104,43 +104,12 @@
          org.apache.log4j.Category.getRoot().setLevel(Level.DEBUG);
          Logger log = Logger.getLogger(getClass());
 
-         SystemUtility.setSystemProperty("jboss.identity", String.valueOf(System.currentTimeMillis()));
+         SecurityUtility.setSystemProperty("jboss.identity", String.valueOf(System.currentTimeMillis()));
 
-         MBeanServer server = null;
-         try
-         {
-            server = (MBeanServer) AccessController.doPrivileged( new PrivilegedExceptionAction()
-            {
-               public Object run() throws Exception
-               {
-                  return MBeanServerFactory.createMBeanServer();
-               }
-            });
-         }
-         catch (PrivilegedActionException e)
-         {
-            throw (Exception) e.getCause();
-         }
-
-         final MBeanServer finalServer = server;
-         final NetworkRegistry registry = NetworkRegistry.getInstance();
-         
-         try
-         {
-            AccessController.doPrivileged( new PrivilegedExceptionAction()
-            {
-               public Object run() throws Exception
-               {
-                  finalServer.registerMBean(registry, new ObjectName("remoting:type=NetworkRegistry"));
-                  return null;
-               }
-            });
-         }
-         catch (PrivilegedActionException e)
-         {
-            throw (Exception) e.getCause();
-         }
-
+         MBeanServer server = SecurityUtility.createMBeanServer();
+         NetworkRegistry registry = NetworkRegistry.getInstance();
+         SecurityUtility.registerMBean(server, registry, new ObjectName("remoting:type=NetworkRegistry"));
+        
          InvokerLocator locator = new InvokerLocator("socket://localhost");
          //ClassLoader clsLoader = Thread.currentThread().getContextClassLoader();
          //SocketServerInvoker invokerSvr = new SocketServerInvoker(clsLoader, locator);
@@ -148,26 +117,10 @@
          //server.registerMBean(invokerSvr, objName);
          //invokerSvr.start();
 
-         final Connector connector = new Connector();
+         Connector connector = new Connector();
          connector.setInvokerLocator(locator.getLocatorURI());
-         final ObjectName obj = new ObjectName("jboss.remoting:type=Connector,transport=" + locator.getProtocol());
-      
-         try
-         {
-            AccessController.doPrivileged( new PrivilegedExceptionAction()
-            {
-               public Object run() throws Exception
-               {
-                  finalServer.registerMBean(connector, obj);
-                  return null;
-               }
-            });
-         }
-         catch (PrivilegedActionException e)
-         {
-            throw (Exception) e.getCause();
-         }
-         
+         ObjectName obj = new ObjectName("jboss.remoting:type=Connector,transport=" + locator.getProtocol());
+         SecurityUtility.registerMBean(server, connector, obj);
          //connector.create();
          connector.start();
 
@@ -192,25 +145,7 @@
             objName = new ObjectName("remoting:type=Detector,transport=jndi");
          }
          
-         try
-         {
-            final Detector finalDetector = detector;
-            final ObjectName finalObjName = objName;
-            
-            AccessController.doPrivileged( new PrivilegedExceptionAction()
-            {
-               public Object run() throws Exception
-               {
-                  finalServer.registerMBean(finalDetector, finalObjName);
-                  return null;
-               }
-            });
-         }
-         catch (PrivilegedActionException e)
-         {
-            throw (Exception) e.getCause();
-         }
-         
+         SecurityUtility.registerMBean(server, detector, objName);
          detector.start();
          System.err.println("Starting Detector");