[jboss-remoting-commits] JBoss Remoting SVN: r3873 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/config.

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

Author: ron.sigal at jboss.com
Date: 2008-04-02 01:38:04 -0400 (Wed, 02 Apr 2008)
New Revision: 3873

Modified:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseParent.java
Log:
JBREM-934: Put MBeanServerFactory.createMBeanServer() and MBeanServer.registerMBean() calls in AccessController.doPrivileged() calls.

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseParent.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseParent.java	2008-04-02 05:36:38 UTC (rev 3872)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseParent.java	2008-04-02 05:38:04 UTC (rev 3873)
@@ -58,6 +58,10 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -81,7 +85,13 @@
    
    public static String getKeystoreFilePath()
    {
-      File dir = new File(FactoryConfigTestCaseParent.class.getResource(".").getFile());
+      File dir = (File)AccessController.doPrivileged( new PrivilegedAction()
+      {
+         public Object run()
+         {
+            return  new File(FactoryConfigTestCaseParent.class.getResource(".").getFile());
+         }
+      });
       while (!"transport".equals(dir.getName()))
       {
          dir = new File(dir.getParent());
@@ -140,7 +150,21 @@
          ServerSocketFactory serverSocketService = getDefaultServerSocketFactory();
          String serverSocketFactoryName = "jboss:type=serversocketfactory";
          ObjectName objName = new ObjectName(serverSocketFactoryName);
-         MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
+         MBeanServer mbeanServer = null;
+         try
+         {
+            mbeanServer = (MBeanServer) AccessController.doPrivileged( new PrivilegedExceptionAction()
+            {
+               public Object run() throws Exception
+               {
+                  return MBeanServerFactory.createMBeanServer();
+               }
+            });
+         }
+         catch (PrivilegedActionException e)
+         {
+            throw (Exception) e.getCause();
+         }
          mbeanServer.registerMBean(serverSocketService, objName);
          sconfig.put(ServerInvoker.SERVER_SOCKET_FACTORY, serverSocketFactoryName);
          
@@ -306,7 +330,21 @@
          ServerSocketFactory serverSocketService = getDefaultServerSocketFactory();
          String serverSocketFactoryName = "jboss:type=serversocketfactory";
          ObjectName objName = new ObjectName(serverSocketFactoryName);
-         MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
+         MBeanServer mbeanServer = null;
+         try
+         {
+            mbeanServer = (MBeanServer) AccessController.doPrivileged( new PrivilegedExceptionAction()
+            {
+               public Object run() throws Exception
+               {
+                  return MBeanServerFactory.createMBeanServer();
+               }
+            });
+         }
+         catch (PrivilegedActionException e)
+         {
+            throw (Exception) e.getCause();
+         }
          mbeanServer.registerMBean(serverSocketService, objName);
          sconfig.put(ServerInvoker.SERVER_SOCKET_FACTORY, serverSocketFactoryName);
          
@@ -471,7 +509,23 @@
          ServerSocketFactory serverSocketService = getDefaultServerSocketFactory();
          String serverSocketFactoryName = "jboss:type=serversocketfactory";
          ObjectName objName = new ObjectName(serverSocketFactoryName);
-         MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
+         MBeanServer mbeanServer = null;
+
+         try
+         {
+            mbeanServer = (MBeanServer) AccessController.doPrivileged( new PrivilegedExceptionAction()
+            {
+               public Object run() throws Exception
+               {
+                  return MBeanServerFactory.createMBeanServer();
+               }
+            });
+         }
+         catch (PrivilegedActionException e)
+         {
+            throw (Exception) e.getCause();
+         }
+             
          mbeanServer.registerMBean(serverSocketService, objName);
          sconfig.put(ServerInvoker.SERVER_SOCKET_FACTORY, serverSocketFactoryName);
          
@@ -622,11 +676,41 @@
          sconfig.put(HTTPSClientInvoker.IGNORE_HTTPS_HOST, "true");
          
          // Put ServerSocketFactory MBean name in config map.
-         ServerSocketFactory serverSocketService = getDefaultServerSocketFactory();
+         final ServerSocketFactory serverSocketService = getDefaultServerSocketFactory();
          String serverSocketFactoryName = "jboss:type=serversocketfactory";
-         ObjectName objName = new ObjectName(serverSocketFactoryName);
-         MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
-         mbeanServer.registerMBean(serverSocketService, objName);
+         final ObjectName objName = new ObjectName(serverSocketFactoryName);
+         MBeanServer mbeanServer = null;
+         try
+         {
+            mbeanServer = (MBeanServer) AccessController.doPrivileged( new PrivilegedExceptionAction()
+            {
+               public Object run() throws Exception
+               {
+                  return MBeanServerFactory.createMBeanServer();
+               }
+            });
+         }
+         catch (PrivilegedActionException e)
+         {
+            throw (Exception) e.getCause();
+         }
+         try
+         {
+            final MBeanServer finalServer = mbeanServer;
+            AccessController.doPrivileged( new PrivilegedExceptionAction()
+            {
+               public Object run() throws Exception
+               {
+                  finalServer.registerMBean(serverSocketService, objName);
+                  return null;
+               }
+            });
+         }
+         catch (PrivilegedActionException e)
+         {
+            throw (Exception) e.getCause();
+         }
+//         mbeanServer.registerMBean(serverSocketService, objName);
          sconfig.put(ServerInvoker.SERVER_SOCKET_FACTORY, serverSocketFactoryName);
          
          // Put SSL keystore parameters in config map.