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

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

Author: ron.sigal at jboss.com
Date: 2008-04-11 20:54:18 -0400 (Fri, 11 Apr 2008)
New Revision: 3932

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java
Log:
JBREM-934: Replaced AccessController.doPrivileged() with SecurityUtility.getLocalHost() and Security.getAddressByName().

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java	2008-04-12 00:53:13 UTC (rev 3931)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/ServerInvoker.java	2008-04-12 00:54:18 UTC (rev 3932)
@@ -36,6 +36,7 @@
 import org.jboss.remoting.stream.StreamHandler;
 import org.jboss.remoting.stream.StreamInvocationHandler;
 import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.util.SecurityUtility;
 import org.jboss.remoting.serialization.ClassLoaderUtility;
 import org.jboss.util.threadpool.BasicThreadPool;
 import org.jboss.util.threadpool.BlockingMode;
@@ -55,7 +56,6 @@
 import java.lang.reflect.Constructor;
 import java.net.InetAddress;
 import java.net.MalformedURLException;
-import java.net.UnknownHostException;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -1136,28 +1136,15 @@
       }
       
       // If no bind address(es) found, try the old way.
-      final String locatorHost = locator.getHost();
+      String locatorhost = locator.getHost();
       InetAddress addr = null;
-      try
+      if(locatorhost != null)
       {
-         addr = (InetAddress)AccessController.doPrivileged( new PrivilegedExceptionAction()
-         {
-            public Object run() throws UnknownHostException
-            {
-               if(locatorHost != null)
-               {
-                  return InetAddress.getByName(locator.getHost());
-               }
-               else
-               {
-                 return InetAddress.getLocalHost();
-               }
-            }
-         });
+         addr = SecurityUtility.getAddressByName(locatorhost);
       }
-      catch (PrivilegedActionException e)
+      else
       {
-         throw (UnknownHostException) e.getCause();
+         addr = SecurityUtility.getLocalHost();
       }
 
       int port = locator.getPort();
@@ -1174,20 +1161,7 @@
          if(clientConnectAddress != null)
          {
             // can't use uri address, as is for client only
-            try
-            {
-               serverBindAddress = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
-               {
-                  public Object run() throws UnknownHostException
-                  {
-                     return InetAddress.getLocalHost().getHostAddress();
-                  }
-               });
-            }
-            catch (PrivilegedActionException e)
-            {
-               throw (UnknownHostException) e.getCause();
-            }
+            serverBindAddress = SecurityUtility.getLocalHost().getHostAddress();
          }
          else
          {