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/AdapterCache.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/AdapterCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdapterCache.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp index d54de5511a6..aff2dd311d9 100644 --- a/cpp/src/IceGrid/AdapterCache.cpp +++ b/cpp/src/IceGrid/AdapterCache.cpp @@ -151,8 +151,14 @@ vector<pair<string, AdapterPrx> > ServerAdapterEntry::getProxies(int& nReplicas) { vector<pair<string, AdapterPrx> > adapters; - nReplicas = 1; - adapters.push_back(make_pair(_id, getProxy())); + try + { + nReplicas = 1; + adapters.push_back(make_pair(_id, getProxy())); + } + catch(const NodeUnreachableException&) + { + } return adapters; } |