diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-05-17 12:27:58 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-05-17 12:27:58 +0000 |
| commit | e52e31abbe3878540a3d79aec167fb24fe73de8e (patch) | |
| tree | 4dbd775cf9c3102c2c673ed3d03aa5653ea42408 /cpp/src/IceGrid/ServerAdapterI.cpp | |
| parent | Fixed bug 997 (diff) | |
| download | ice-e52e31abbe3878540a3d79aec167fb24fe73de8e.tar.bz2 ice-e52e31abbe3878540a3d79aec167fb24fe73de8e.tar.xz ice-e52e31abbe3878540a3d79aec167fb24fe73de8e.zip | |
More work on session activation.
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp index c695e0efe9e..5ae4619e327 100644 --- a/cpp/src/IceGrid/ServerAdapterI.cpp +++ b/cpp/src/IceGrid/ServerAdapterI.cpp @@ -105,7 +105,7 @@ ServerAdapterI::getDirectProxy(const Ice::Current& current) const { AdapterNotActiveException ex; ServerState state = _server->getState(); - ex.activatable = _server->getActivationMode() == ServerI::OnDemand || state == Activating || state == Active; + ex.activatable = _server->canActivateOnDemand() || state == Activating || state == Active; ex.timeout = static_cast<int>(_waitTime.toMilliSeconds()); throw ex; } |