diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-25 20:45:35 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-25 20:45:35 +0000 |
| commit | d89f4f58ea4ab21661540c33f5e3481c67a758b1 (patch) | |
| tree | 4f9a09fb53e573863c29b62d6e7777eb83ee8873 /cpp/src/IceGrid/ServerCache.cpp | |
| parent | Fix some SRPM generation bugs, some copy commands and removed buildrequires (diff) | |
| download | ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.tar.bz2 ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.tar.xz ice-d89f4f58ea4ab21661540c33f5e3481c67a758b1.zip | |
Fixed a bug where IcePatch2 couldn't be deployed and used in a new
application.
Fixed deadlock.
Added automatic patching after adding an application.
Diffstat (limited to 'cpp/src/IceGrid/ServerCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index f996813f97d..28fc0830595 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -504,12 +504,12 @@ ServerEntry::syncImpl(AdapterPrxDict& adpts, int& activationTimeout, int& deacti int timeout = nodeCache.getSessionTimeout() * 1000; // sec to ms _loaded = _load; assert(_loaded.get()); - _proxy = ServerPrx::uncheckedCast(proxy->ice_timeout(timeout)); + _proxy = ServerPrx::uncheckedCast(proxy->ice_timeout(timeout)->ice_collocationOptimization(false)); _adapters.clear(); for(AdapterPrxDict::const_iterator p = adpts.begin(); p != adpts.end(); ++p) { - AdapterPrx adapter = AdapterPrx::uncheckedCast(p->second->ice_timeout(timeout)); - _adapters.insert(make_pair(p->first, adapter)); + Ice::ObjectPrx adapter = p->second->ice_timeout(timeout)->ice_collocationOptimization(false); + _adapters.insert(make_pair(p->first, AdapterPrx::uncheckedCast(adapter))); } activationTimeout += timeout; deactivationTimeout += timeout; |