internal thread pool changes

1 files changed, 9 insertions, 4 deletions

diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 5c7f00b2643..3b32c71d510 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -207,8 +207,7 @@ IceInternal::Instance::clientThreadPool()
 
     if(!_clientThreadPool) // Lazy initialization.
     {
-	int threadNum = _properties->getPropertyAsIntWithDefault("Ice.ThreadPool.Client.Size", 1);
-	_clientThreadPool = new ThreadPool(this, threadNum, 0);
+	_clientThreadPool = new ThreadPool(this, "Ice.ThreadPool.Client", 0);
     }
 
     return _clientThreadPool;
@@ -223,9 +222,15 @@ IceInternal::Instance::serverThreadPool()
     
     if(!_serverThreadPool) // Lazy initialization.
     {
-	int threadNum = _properties->getPropertyAsIntWithDefault("Ice.ThreadPool.Server.Size", 10);
+	//
+	// Make sure that the server thread pool default is set
+	// correctly.
+	//
+	_properties->setProperty("Ice.ThreadPool.Server.Size",
+				 _properties->getPropertyWithDefault("Ice.ThreadPool.Server.Size", "10"));
+
 	int timeout = _properties->getPropertyAsInt("Ice.ServerIdleTime");
-	_serverThreadPool = new ThreadPool(this, threadNum, timeout);
+	_serverThreadPool = new ThreadPool(this, "Ice.ThreadPool.Server", timeout);
     }
 
     return _serverThreadPool;