Bug 2729 - Added Ice.TCP.Backlog property

5 files changed, 12 insertions, 18 deletions

diff --git a/java/CHANGES b/java/CHANGES
index c19bc8fedfd..319c922a485 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -1,6 +1,9 @@
 Changes since version 3.2.X (binary incompatible)
 -------------------------------------------------
 
+- Added a new property, Ice.TCP.Backlog, which can be used to configure
+  the backlog for TCP/IP sockets. The default value is 511.
+
 - The use of sequences (and structs containing sequences) as valid 
   dictionary keys has been deprecated and will be removed in a future
   release.
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index 84775bb76b7..6f205bcda0e 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -244,12 +244,12 @@ public final class Network
     }
 
     public static java.net.InetSocketAddress
-    doBind(java.nio.channels.ServerSocketChannel fd, java.net.InetSocketAddress addr)
+    doBind(java.nio.channels.ServerSocketChannel fd, java.net.InetSocketAddress addr, int backlog)
     {
         try
         {
             java.net.ServerSocket sock = fd.socket();
-            sock.bind(addr);
+            sock.bind(addr, backlog);
             return (java.net.InetSocketAddress)sock.getLocalSocketAddress();
         }
         catch(java.io.IOException ex)
@@ -973,7 +973,7 @@ public final class Network
         
         java.net.InetSocketAddress addr = new java.net.InetSocketAddress("127.0.0.1", 0);
         
-        addr = doBind(fd, addr);
+        addr = doBind(fd, addr, 0);
         
         try
         {
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index ecf22948a2a..ef861c56542 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Feb 18 10:11:33 2008
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Feb 27 12:48:24 2008
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -114,6 +114,7 @@ public final class PropertyNames
         new Property("Ice\\.Trace\\.Slicing", false, null),
         new Property("Ice\\.UDP\\.RcvSize", false, null),
         new Property("Ice\\.UDP\\.SndSize", false, null),
+        new Property("Ice\\.TCP\\.Backlog", false, null),
         new Property("Ice\\.TCP\\.RcvSize", false, null),
         new Property("Ice\\.TCP\\.SndSize", false, null),
         new Property("Ice\\.UseSyslog", false, null),
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 6c172112669..72c8b923d06 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -189,12 +189,7 @@ class TcpAcceptor implements Acceptor
         _instance = instance;
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
-        _backlog = 0;
-
-        if(_backlog <= 0)
-        {
-            _backlog = 5;
-        }
+        _backlog = instance.initializationData().properties.getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
 
         try
         {
@@ -224,7 +219,7 @@ class TcpAcceptor implements Acceptor
                 String s = "attempting to bind to tcp socket " + toString();
                 _logger.trace(_traceLevels.networkCat, s);
             }
-            _addr = Network.doBind(_fd, _addr);
+            _addr = Network.doBind(_fd, _addr, _backlog);
         }
         catch(RuntimeException ex)
         {
diff --git a/java/src/IceSSL/AcceptorI.java b/java/src/IceSSL/AcceptorI.java
index c967d5501c3..de5be3781a3 100644
--- a/java/src/IceSSL/AcceptorI.java
+++ b/java/src/IceSSL/AcceptorI.java
@@ -204,12 +204,7 @@ final class AcceptorI implements IceInternal.Acceptor
         _instance = instance;
         _adapterName = adapterName;
         _logger = instance.communicator().getLogger();
-        _backlog = 0;
-
-        if(_backlog <= 0)
-        {
-            _backlog = 5;
-        }
+        _backlog = instance.communicator().getProperties().getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
 
         try
         {
@@ -239,7 +234,7 @@ final class AcceptorI implements IceInternal.Acceptor
                 String s = "attempting to bind to ssl socket " + toString();
                 _logger.trace(_instance.networkTraceCategory(), s);
             }
-            _addr = IceInternal.Network.doBind(_fd, _addr);
+            _addr = IceInternal.Network.doBind(_fd, _addr, _backlog);
         }
         catch(RuntimeException ex)
         {