Revert "Enhance socket connection with configurable timeout"

This reverts commit 40da3f9.

Author: dmatej

orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java

@@ -20,7 +20,6 @@
 
 package com.sun.corba.ee.impl.misc;
 
-import java.net.Socket;
 import java.security.AccessController;
 import java.security.PermissionCollection;
 import java.security.Policy;
@@ -73,33 +72,24 @@
 import com.sun.corba.ee.impl.ior.iiop.JavaSerializationComponent;
 import com.sun.corba.ee.impl.javax.rmi.CORBA.Util;
 
-import static com.sun.corba.ee.spi.misc.ORBConstants.TRANSPORT_TCP_CONNECT_MAX_TIME_TO_WAIT;
-
 /**
  *  Handy class full of static functions that don't belong in util.Utility for pure ORB reasons.
  */
 public final class ORBUtility {
-
-    public static SocketChannel openSocketChannel(SocketAddress sa) throws IOException {
-        return openSocketChannel(sa, TRANSPORT_TCP_CONNECT_MAX_TIME_TO_WAIT);
-    }
-
     /** Utility method for working around leak in SocketChannel.open( SocketAddress )
      * method.
      * @param sa address to connect to
-     * @param timeout – the timeout value to be used in milliseconds.
      * @return The opened channel
      * @throws java.io.IOException If an I/O error occurs
      * @see SocketChannel#connect(java.net.SocketAddress)
      */
-    public static SocketChannel openSocketChannel(SocketAddress sa, int timeout)
+    public static SocketChannel openSocketChannel( SocketAddress sa ) 
         throws IOException {
 
         SocketChannel sc = SocketChannel.open() ;
 
         try {
-            Socket socket = sc.socket();
-            socket.connect(sa, timeout);
+            sc.connect( sa ) ;
             return sc ;
         } catch (RuntimeException | IOException exc ) {
             try {

orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionImpl.java

@@ -225,13 +225,8 @@ private ConnectionImpl(ORB orb,
         this.contactInfo = contactInfo;
 
         try {
-            TcpTimeouts tcpConnectTimeouts = orb.getORBData().getTransportTcpConnectTimeouts();
             defineSocket(useSelectThreadToWait,
-                    orb.getORBData().getSocketFactory().createSocket(
-                            orb.getORBData().connectionSocketType(),
-                            new InetSocketAddress(hostname, port),
-                            tcpConnectTimeouts.get_max_time_to_wait())
-            );
+                    orb.getORBData().getSocketFactory().createSocket(socketType, new InetSocketAddress(hostname, port)));
         } catch (Throwable t) {
             throw wrapper.connectFailure(t, socketType, hostname,
                     Integer.toString(port));

orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultSocketFactoryImpl.java

@@ -38,7 +38,7 @@
 public class DefaultSocketFactoryImpl
     implements ORBSocketFactory
 {
-    protected ORB orb;
+    private ORB orb;
 
     public void setORB(ORB orb)
     {
@@ -62,6 +62,27 @@ public ServerSocket createServerSocket(String type,
         return serverSocket;
     }
 
+    public Socket createSocket(String type, 
+                               InetSocketAddress inetSocketAddress)
+        throws IOException
+    {
+        SocketChannel socketChannel = null;
+        Socket socket = null;
+
+        if (orb.getORBData().connectionSocketType().equals(ORBConstants.SOCKETCHANNEL)) {
+            socketChannel = ORBUtility.openSocketChannel(inetSocketAddress);
+            socket = socketChannel.socket();
+        } else {
+            socket = new Socket(inetSocketAddress.getHostName(),
+                                inetSocketAddress.getPort());
+        }
+
+        // Disable Nagle's algorithm (i.e., always send immediately).
+        socket.setTcpNoDelay(true);
+
+        return socket;
+    }
+
     public void setAcceptedSocketOptions(Acceptor acceptor,
                                          ServerSocket serverSocket,
                                          Socket socket)

orbmain/src/main/java/com/sun/corba/ee/spi/transport/ORBSocketFactory.java

@@ -24,14 +24,9 @@
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.ServerSocket;
-import java.nio.channels.SocketChannel;
 
-import com.sun.corba.ee.impl.misc.ORBUtility;
-import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.orb.ORB;
 
-import static com.sun.corba.ee.spi.misc.ORBConstants.TRANSPORT_TCP_CONNECT_MAX_TIME_TO_WAIT;
-
 /**
  * @author Harold Carr
  */
@@ -43,31 +38,9 @@ public ServerSocket createServerSocket(String type,
                                            InetSocketAddress inetSocketAddress)
         throws IOException;
 
-    public default Socket createSocket(String type,
-                                       InetSocketAddress inetSocketAddress) throws IOException {
-        return createSocket(type, inetSocketAddress, TRANSPORT_TCP_CONNECT_MAX_TIME_TO_WAIT);
-    }
-
-    public default Socket createSocket(String type,
-                                       InetSocketAddress inetSocketAddress,
-                                       int timeout)
-            throws IOException {
-        SocketChannel socketChannel = null;
-        Socket socket = null;
-
-        if (type.equals(ORBConstants.SOCKETCHANNEL)) {
-            socketChannel = ORBUtility.openSocketChannel(inetSocketAddress, timeout);
-            socket = socketChannel.socket();
-        } else {
-            socket = new Socket();
-            socket.connect(inetSocketAddress, timeout);
-        }
-
-        // Disable Nagle's algorithm (i.e., always send immediately).
-        socket.setTcpNoDelay(true);
-
-        return socket;
-    }
+    public Socket createSocket(String type, 
+                               InetSocketAddress inetSocketAddress)
+        throws IOException;
 
     public void setAcceptedSocketOptions(Acceptor acceptor,
                                          ServerSocket serverSocket,

orbmain/src/test/java/com/sun/corba/ee/impl/transport/DefaultSocketFactoryImplTest.java

@@ -20,7 +20,6 @@
 package corba.nortel ;
 
 import com.sun.corba.ee.impl.transport.DefaultSocketFactoryImpl;
-import com.sun.corba.ee.spi.transport.TcpTimeouts;
 
 import java.io.IOException;
 
@@ -63,15 +62,13 @@ public Socket createSocket(String type, InetSocketAddress in) throws IOException
         }
 
         Socket socket = null;
-        TcpTimeouts tcpConnectTimeouts = orb.getORBData().getTransportTcpConnectTimeouts();
         if (useNio) {
-            socket = super.createSocket(orb.getORBData().connectionSocketType(), in, tcpConnectTimeouts.get_max_time_to_wait());
+            socket = super.createSocket(type, in); 
         } else {
-            socket = new Socket();
-            socket.connect(in, tcpConnectTimeouts.get_max_time_to_wait());
+            socket = new Socket(in.getHostName(), in.getPort());
+            socket.setTcpNoDelay(true);
         }
-
-        socket.setTcpNoDelay(true);
+        
         savedSocket = socket;
         return socket;
     }