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

jboss-remoting-commits at lists.jboss.org jboss-remoting-commits at lists.jboss.org
Thu Mar 20 21:36:12 EDT 2008


Author: ron.sigal at jboss.com
Date: 2008-03-20 21:36:12 -0400 (Thu, 20 Mar 2008)
New Revision: 3704

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingServerSocketFactory.java
Log:
JBREM-934: Put ServerSocket.accept() in AccessController.doPrivileged() call.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingServerSocketFactory.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingServerSocketFactory.java	2008-03-21 01:35:50 UTC (rev 3703)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/coyote/ssl/RemotingServerSocketFactory.java	2008-03-21 01:36:12 UTC (rev 3704)
@@ -35,6 +35,9 @@
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -180,9 +183,25 @@
     *
     * @throws java.io.IOException;
     */
-   public Socket acceptSocket(ServerSocket socket) throws IOException
+   public Socket acceptSocket(final ServerSocket serverSocket) throws IOException
    {
-      return socket.accept();
+      Socket socket = null;
+      try
+      {
+          socket = (Socket)AccessController.doPrivileged( new PrivilegedExceptionAction()
+          {
+             public Object run() throws Exception
+             {
+                 return serverSocket.accept();
+             }
+          });
+      }
+      catch (PrivilegedActionException e)
+      {
+          throw (IOException) e.getCause();
+      }
+      
+      return socket;
    }
 
    /**




More information about the jboss-remoting-commits mailing list