diff options
Diffstat (limited to 'cpp/src/IceGrid/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 718afd6031b..92f63823d8d 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -66,9 +66,7 @@ NodeI::loadServer(const ServerDescriptorPtr& desc, servant = new ServerI(this, proxy, _serversDir, desc->name, _waitTime); current.adapter->add(servant, id); } - activationTimeout = desc->activationTimeout > 0 ? desc->activationTimeout : _waitTime; - deactivationTimeout = desc->deactivationTimeout > 0 ? desc->deactivationTimeout : _waitTime; - proxy->load(desc, adapters); + proxy->load(desc, adapters, activationTimeout, deactivationTimeout); return proxy; } |