fixes

3 files changed, 16 insertions, 30 deletions

diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index b30de100d37..3b063682c2f 100644
--- a/java/src/IceInternal/Connection.java
+++ b/java/src/IceInternal/Connection.java
@@ -1497,6 +1497,11 @@ public final class Connection extends EventHandler
 	    os.writeByte(Protocol.closeConnectionMsg);
 	    os.writeByte((byte)0); // Compression status.
 	    os.writeInt(Protocol.headerSize); // Message size.
+
+	    //
+	    // Send the message.
+	    //
+	    TraceUtil.traceHeader("sending close connection", os, _logger, _traceLevels);
 	    _transceiver.write(os, _endpoint.timeout());
 	    _transceiver.shutdown();
 	}
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index ad1704c253b..57791047dc5 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -189,26 +189,6 @@ public class Instance
 	
 	if(_clientThreadPool == null) // Lazy initialization.
 	{
-// Not necessary anymore, this is now the default for every thread pool
-/*
-	    //
-	    // Make sure that the client thread pool defaults are
-	    // correctly.
-	    //
-	    if(_properties.getProperty("Ice.ThreadPool.Client.Size") == "")
-	    {
-		_properties.setProperty("Ice.ThreadPool.Client.Size", "1");
-	    }
-	    if(_properties.getProperty("Ice.ThreadPool.Client.SizeMax") == "")
-	    {
-		_properties.setProperty("Ice.ThreadPool.Client.SizeMax", "1");
-	    }
-	    if(_properties.getProperty("Ice.ThreadPool.Client.SizeWarn") == "")
-	    {
-		_properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-	    }
-*/
-
 	    _clientThreadPool = new ThreadPool(this, "Ice.ThreadPool.Client", 0);
         }
 
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index 9bdb06ea3ac..11adfb87527 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -73,26 +73,27 @@ public final class ThreadPool
 
 	//
 	// We use just one thread as the default. This is the fastest
-	// possible setting, still allows one level of nesting, and
+	// psossible setting, still allows one level of nesting, and
 	// doesn't require to make the servants thread safe.
 	//
 	int size = _instance.properties().getPropertyAsIntWithDefault(_prefix + ".Size", 1);
 	if(size < 1)
 	{
 	    size = 1;
-	}
-	_size = size;
-	
-	int sizeMax = _instance.properties().getPropertyAsIntWithDefault(_prefix + ".SizeMax", _size * 10);
-	if(sizeMax < _size)
+	}		
+
+	int sizeMax = _instance.properties().getPropertyAsIntWithDefault(_prefix + ".SizeMax", size);
+	if(sizeMax < size)
 	{
-	    sizeMax = _size;
+	    sizeMax = size;
 	}
-	_sizeMax = sizeMax;
+		
+	int sizeWarn = _instance.properties().getPropertyAsIntWithDefault(_prefix + ".SizeWarn", sizeMax * 80 / 100);
 
-	int sizeWarn = _instance.properties().getPropertyAsIntWithDefault(_prefix + ".SizeWarn", _sizeMax * 80 / 100);
+	_size = size;
+	_sizeMax = sizeMax;
 	_sizeWarn = sizeWarn;
-
+	
         _messageSizeMax = _instance.messageSizeMax();
 
 	try