summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterI.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2003-03-13 19:53:21 +0000
committerMarc Laukien <marc@zeroc.com>2003-03-13 19:53:21 +0000
commitd774349054e09a717a92f95391dd663f1ba8b29b (patch)
treed2784c92c78aef72806add1b9c87ab5e1259f32d /cpp/src/Ice/ObjectAdapterI.cpp
parentstarted with shrinking pool (diff)
downloadice-d774349054e09a717a92f95391dd663f1ba8b29b.tar.bz2
ice-d774349054e09a717a92f95391dd663f1ba8b29b.tar.xz
ice-d774349054e09a717a92f95391dd663f1ba8b29b.zip
started with shrinking pool; inlined ops in IceUtil::Time
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 4d8f559a058..f96d57b72af 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -609,8 +609,9 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
setLocator(_instance->referenceFactory()->getDefaultLocator());
}
- int threadNum = _instance->properties()->getPropertyAsInt(_name + ".ThreadPool.Size");
- if(threadNum > 0)
+ int size = _instance->properties()->getPropertyAsInt(_name + ".ThreadPool.Size");
+ int sizeMax = _instance->properties()->getPropertyAsInt(_name + ".ThreadPool.SizeMax");
+ if(size > 0 || sizeMax > 0)
{
_threadPool = new ThreadPool(_instance, _name + ".ThreadPool", 0);
}