[jboss-remoting-commits] JBoss Remoting SVN: r3928 - 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:49:56 -0400 (Fri, 11 Apr 2008)
New Revision: 3928

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

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java	2008-04-10 20:23:49 UTC (rev 3927)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java	2008-04-12 00:49:56 UTC (rev 3928)
@@ -38,6 +38,7 @@
 import org.jboss.remoting.transport.Connector;
 import org.jboss.remoting.transport.PortUtil;
 import org.jboss.remoting.transport.local.LocalClientInvoker;
+import org.jboss.remoting.util.SecurityUtility;
 import org.jboss.util.id.GUID;
 import org.jboss.util.threadpool.BasicThreadPool;
 import org.jboss.util.threadpool.BlockingMode;
@@ -52,12 +53,9 @@
 import java.io.StreamCorruptedException;
 import java.net.InetAddress;
 import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
 import java.rmi.MarshalException;
 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.HashSet;
@@ -941,20 +939,7 @@
                }
                if (host == null)
                {
-                  try
-                  {
-                     host = (String)AccessController.doPrivileged( new PrivilegedExceptionAction()
-                     {
-                        public Object run() throws UnknownHostException
-                        {
-                           return InetAddress.getLocalHost().getHostAddress();
-                        }
-                     });
-                  }
-                  catch (PrivilegedActionException e)
-                  {
-                     throw (UnknownHostException) e.getCause();
-                  } 
+                  host = SecurityUtility.getLocalHost().getHostAddress();
                   metadata.put(CALLBACK_SERVER_HOST, host);
                }
                if (port == -1)