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

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

Author: ron.sigal at jboss.com
Date: 2008-04-11 21:43:08 -0400 (Fri, 11 Apr 2008)
New Revision: 3963

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java
Log:
JBREM-934: Replaced AccessController.doPrivileged() call with SecurityUtility.connect() call.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java	2008-04-12 01:42:21 UTC (rev 3962)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketClientInvoker.java	2008-04-12 01:43:08 UTC (rev 3963)
@@ -27,6 +27,7 @@
 import org.jboss.remoting.InvocationFailureException;
 import org.jboss.remoting.InvokerLocator;
 import org.jboss.remoting.serialization.ClassLoaderUtility;
+import org.jboss.remoting.util.SecurityUtility;
 
 import javax.net.SocketFactory;
 import java.io.IOException;
@@ -35,10 +36,6 @@
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.net.InetSocketAddress;
-import java.rmi.MarshalException;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
 import java.util.Map;
 
 /**
@@ -188,7 +185,7 @@
       }
 
       configureSocket(s);
-      final InetSocketAddress inetAddr = new InetSocketAddress(address, port);
+      InetSocketAddress inetAddr = new InetSocketAddress(address, port);
       
       if (timeout < 0)
       {
@@ -196,26 +193,8 @@
          if (timeout < 0)
             timeout = 0;
       }
-      
-      final Socket finalSocket = s;
-      final int finalTimeout = timeout;
-      
-      try
-      {
-         AccessController.doPrivileged( new PrivilegedExceptionAction()
-         {
-            public Object run() throws Exception
-            {
-               finalSocket.connect(inetAddr, finalTimeout);
-               return null;
-            }
-         });
-      }
-      catch (PrivilegedActionException e)
-      {
-         throw (IOException) e.getCause();
-      }
 
+      SecurityUtility.connect(s, inetAddr, timeout);
       return s;
    }