[jboss-remoting-commits] JBoss Remoting SVN: r5008 - remoting2/branches/2.x/src/main/org/jboss/remoting/serialization.

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

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

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/SerializationStreamFactory.java
Log:
JBREM-1116: Eliminated dependence on SecurityUtility.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/SerializationStreamFactory.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/SerializationStreamFactory.java	2009-04-14 10:17:17 UTC (rev 5007)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/SerializationStreamFactory.java	2009-04-14 10:17:38 UTC (rev 5008)
@@ -30,6 +30,7 @@
 
 import java.io.IOException;
 import java.security.AccessController;
+import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 import java.util.Map;
@@ -60,7 +61,7 @@
       try
       {
          String defaultValue = JavaSerializationManager.class.getName();
-         String managerClassName = SecurityUtility.getSystemProperty("SERIALIZATION", defaultValue);
+         String managerClassName = getSystemProperty("SERIALIZATION", defaultValue);
          setManagerClassName(DEFAULT, managerClassName);
       }
       catch(Exception e)
@@ -196,4 +197,27 @@
       return getManagerInstance(DEFAULT);
    }
 
+   static private String getSystemProperty(final String name, final String defaultValue)
+   {
+      if (SecurityUtility.skipAccessControl())
+         return System.getProperty(name, defaultValue);
+         
+      String value = null;
+      try
+      {
+         value = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
+         {
+            public Object run() throws Exception
+            {
+               return System.getProperty(name, defaultValue);
+            }
+         });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (RuntimeException) e.getCause();
+      }
+      
+      return value;
+   }
 }
\ No newline at end of file