Fix for bug 2721

1 files changed, 1 insertions, 32 deletions

diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 87e1f619adf..e09bf7c760d 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -46,40 +46,9 @@ class TcpAcceptor implements Acceptor
     public Transceiver
     accept()
     {
-        java.nio.channels.SocketChannel fd = null;
-        while(true)
-        {
-            try
-            {
-                fd = _fd.accept();
-                break;
-            }
-            catch(java.io.IOException ex)
-            {
-                if(Network.interrupted(ex))
-                {
-                    continue;
-                }
-                Ice.SocketException se = new Ice.SocketException();
-                se.initCause(ex);
-                throw se;
-            }
-        }
-
+        java.nio.channels.SocketChannel fd = Network.doAccept(_fd);
         Network.setBlock(fd, false);
         Network.setTcpBufSize(fd, _instance.initializationData().properties, _logger);
-        try
-        {
-            java.net.Socket socket = fd.socket();
-            socket.setTcpNoDelay(true);
-            socket.setKeepAlive(true);
-        }
-        catch(java.io.IOException ex)
-        {
-            Ice.SocketException se = new Ice.SocketException();
-            se.initCause(ex);
-            throw se;
-        }
 
         if(_traceLevels.network >= 1)
         {