[jboss-remoting-commits] JBoss Remoting SVN: r5027 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/deadlock.

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

Author: ron.sigal at jboss.com
Date: 2009-04-14 06:31:06 -0400 (Tue, 14 Apr 2009)
New Revision: 5027

Modified:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/deadlock/Server.java
Log:
JBREM-1116: Eliminated dependence on SecurityUtility.

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/deadlock/Server.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/deadlock/Server.java	2009-04-14 10:30:40 UTC (rev 5026)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/detection/jndi/deadlock/Server.java	2009-04-14 10:31:06 UTC (rev 5027)
@@ -45,6 +45,9 @@
 import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -228,7 +231,7 @@
          namingBeanImplClass = Class.forName("org.jnp.server.NamingBeanImpl");
          namingBean = namingBeanImplClass.newInstance();
          Method startMethod = namingBeanImplClass.getMethod("start", new Class[] {});
-         SecurityUtility.setSystemProperty("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
+         setSystemProperty("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
          startMethod.invoke(namingBean, new Object[] {});
       }
       catch (Exception e)
@@ -347,6 +350,29 @@
       }
 
    }
-
+   
+   static private void setSystemProperty(final String name, final String value)
+   {
+      if (SecurityUtility.skipAccessControl())
+      {
+         System.setProperty(name, value);
+         return;
+      }
+      
+      try
+      {
+         AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return System.setProperty(name, value);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (RuntimeException) e.getCause();
+      }
+   }
 }