Index: tcp/DataSender.java
===================================================================
--- tcp/DataSender.java	(revision 3540)
+++ tcp/DataSender.java	(working copy)
@@ -19,7 +19,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.SocketAddress;
 import java.net.SocketException;
 
 import org.apache.catalina.cluster.ClusterMessage;
@@ -713,7 +715,17 @@
      * @throws SocketException
      */
     protected void createSocket() throws IOException, SocketException {
-        socket = new Socket(getAddress(), getPort());
+        SocketAddress sockAddr = new InetSocketAddress(getAddress(), getPort());
+        socket = new Socket();
+        int timeout = (int) getAckTimeout();
+        if (timeout > 0)
+        {
+            socket.connect(sockAddr, timeout);
+        }
+        else
+        {
+            socket.connect(sockAddr);
+        }
     }
 
     /**