diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 15:50:57 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 15:50:57 +0000 |
| commit | 2b5768c8755cccd073e910a604b3152c3497a636 (patch) | |
| tree | e6f486098773e9c7a45eb232b2f40c33cacd70ab /cpp/src/IceGrid/ServerAdapterI.cpp | |
| parent | Fixed bug #1611 (diff) | |
| download | ice-2b5768c8755cccd073e910a604b3152c3497a636.tar.bz2 ice-2b5768c8755cccd073e910a604b3152c3497a636.tar.xz ice-2b5768c8755cccd073e910a604b3152c3497a636.zip | |
Fixed timeout issue
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp index 8bd4c1013e3..5f763374dec 100644 --- a/cpp/src/IceGrid/ServerAdapterI.cpp +++ b/cpp/src/IceGrid/ServerAdapterI.cpp @@ -38,7 +38,6 @@ ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Cur { { Lock sync(*this); - int timeout; if(_proxy) { // @@ -53,7 +52,7 @@ ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Cur // Nothing else waits for this adapter so we must make sure that this // adapter if still activatable. // - if(!_server->isAdapterActivatable(_id, timeout)) + if(!_server->isAdapterActivatable(_id)) { cb->ice_response(0); return; @@ -114,7 +113,7 @@ ServerAdapterI::getDirectProxy(const Ice::Current& current) const else { AdapterNotActiveException ex; - ex.activatable = _server->isAdapterActivatable(_id, ex.timeout); + ex.activatable = _server->isAdapterActivatable(_id); throw ex; } } |