diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-06 10:42:03 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-06 10:42:03 +0100 |
| commit | 49a87f062dbd77d1d5389d486e7fb9f0e79b6fed (patch) | |
| tree | 70879a75716adad2694d05f81ef98f69e141a33c /cpp/src/IceGrid/ServerCache.cpp | |
| parent | Slice compilers now emit deprecated warning for classes with operations (ICE-... (diff) | |
| download | ice-49a87f062dbd77d1d5389d486e7fb9f0e79b6fed.tar.bz2 ice-49a87f062dbd77d1d5389d486e7fb9f0e79b6fed.tar.xz ice-49a87f062dbd77d1d5389d486e7fb9f0e79b6fed.zip | |
Fixed ICE-7548 - getAdminProxy no longer returns 0 if synchronization is in progress
Diffstat (limited to 'cpp/src/IceGrid/ServerCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 20a9d967ff3..03b4332f43b 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -569,14 +569,7 @@ ServerEntry::getAdminProxy() Ice::Identity adminId; adminId.name = _id; adminId.category = _cache.getInstanceName() + "-NodeServerAdminRouter"; - try - { - return getProxy(true)->ice_identity(adminId); - } - catch(const SynchronizationException&) - { - } - return 0; + return getProxy(true)->ice_identity(adminId); } AdapterPrx |