Ensure initial socket setup takes into account timeoutMS

Author: rozza

driver-core/src/main/com/mongodb/internal/connection/SocketStream.java

@@ -119,7 +119,7 @@ private SSLSocket initializeSslSocketOverSocksProxy(final OperationContext opera
         final int serverPort = address.getPort();
 
         SocksSocket socksProxy = new SocksSocket(settings.getProxySettings());
-        configureSocket(socksProxy, settings);
+        configureSocket(socksProxy, operationContext, settings);
         InetSocketAddress inetSocketAddress = toSocketAddress(serverHost, serverPort);
         socksProxy.connect(inetSocketAddress, operationContext.getTimeoutContext().getConnectTimeoutMs());
 
@@ -141,7 +141,7 @@ private static InetSocketAddress toSocketAddress(final String serverHost, final
 
     private Socket initializeSocketOverSocksProxy(final OperationContext operationContext) throws IOException {
         Socket createdSocket = socketFactory.createSocket();
-        configureSocket(createdSocket, settings);
+        configureSocket(createdSocket, operationContext, settings);
         /*
           Wrap the configured socket with SocksSocket to add extra functionality.
           Reason for separate steps: We can't directly extend Java 11 methods within 'SocksSocket'

driver-core/src/main/com/mongodb/internal/connection/SocketStreamHelper.java

@@ -28,7 +28,6 @@
 import java.net.SocketOption;
 
 import static com.mongodb.internal.connection.SslHelper.configureSslSocket;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 final class SocketStreamHelper {
@@ -72,15 +71,18 @@ final class SocketStreamHelper {
     static void initialize(final OperationContext operationContext, final Socket socket,
             final InetSocketAddress inetSocketAddress, final SocketSettings settings,
             final SslSettings sslSettings) throws IOException {
-        configureSocket(socket, settings);
+        configureSocket(socket, operationContext, settings);
         configureSslSocket(socket, sslSettings, inetSocketAddress);
         socket.connect(inetSocketAddress, operationContext.getTimeoutContext().getConnectTimeoutMs());
     }
 
-    static void configureSocket(final Socket socket, final SocketSettings settings) throws SocketException {
+    static void configureSocket(final Socket socket, final OperationContext operationContext, final SocketSettings settings) throws SocketException {
         socket.setTcpNoDelay(true);
-        socket.setSoTimeout(settings.getReadTimeout(MILLISECONDS));
         socket.setKeepAlive(true);
+        int readTimeoutMS = (int) operationContext.getTimeoutContext().getReadTimeoutMS();
+        if (readTimeoutMS > 0) {
+            socket.setSoTimeout(readTimeoutMS);
+        }
 
         // Adding keep alive options for users of Java 11+. These options will be ignored for older Java versions.
         setExtendedSocketOptions(socket);