diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-06-19 17:04:26 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-19 17:04:26 +0000 |
| commit | b6428fd8b7b55d20989536e6fd8bf0b0bad05f02 (patch) | |
| tree | 699f50faa18192ecb2cf3bed4af5f940c148e3d8 /cpp/src/IceGrid/ServerCache.cpp | |
| parent | fixing name of the Glacier2 router's filter tracing property (diff) | |
| download | ice-b6428fd8b7b55d20989536e6fd8bf0b0bad05f02.tar.bz2 ice-b6428fd8b7b55d20989536e6fd8bf0b0bad05f02.tar.xz ice-b6428fd8b7b55d20989536e6fd8bf0b0bad05f02.zip | |
Fixed bug 1097
Diffstat (limited to 'cpp/src/IceGrid/ServerCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 00e5c85062b..3f64c713abd 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -276,8 +276,8 @@ ServerEntry::destroy() _load.reset(0); _loaded.reset(0); -// _proxy = 0; -// _adapters.clear(); + _proxy = 0; + _adapters.clear(); } ServerInfo @@ -328,6 +328,7 @@ ServerEntry::getProxy(int& activationTimeout, int& deactivationTimeout, string& Lock sync(*this); if(_loaded.get() || _proxy && !upToDate) // Synced or if not up to date is fine { + assert(_loaded.get() || _load.get()); proxy = _proxy; activationTimeout = _activationTimeout; deactivationTimeout = _deactivationTimeout; @@ -355,6 +356,7 @@ ServerEntry::getProxy(int& activationTimeout, int& deactivationTimeout, string& Lock sync(*this); if(_loaded.get() || _proxy && !upToDate) // Synced or if not up to date is fine { + assert(_loaded.get() || _load.get()); activationTimeout = _activationTimeout; deactivationTimeout = _deactivationTimeout; node = _loaded.get() ? _loaded->node : _load->node; |