diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-07-13 14:24:51 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-07-13 14:24:51 +0000 |
| commit | 24abfcd7a2c568bc556d244cf4c89660511a2cab (patch) | |
| tree | 6ea87a0e4f3d89b78ab00e51598786d5722c645c /cpp/src/IceGrid/NodeI.cpp | |
| parent | Added chat demo (diff) | |
| download | ice-24abfcd7a2c568bc556d244cf4c89660511a2cab.tar.bz2 ice-24abfcd7a2c568bc556d244cf4c89660511a2cab.tar.xz ice-24abfcd7a2c568bc556d244cf4c89660511a2cab.zip | |
Changed server descriptor attributse to be strings to allow the use of
variables
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; } |