diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-11-28 10:00:43 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-11-28 10:00:43 -0500 |
| commit | 9b300be79e1feebd09f16e01adeb5a7a005cda2e (patch) | |
| tree | 59f531f3347d9087fdc641a1e05f1e4675bdb0c4 /cpp/src/IceGrid/ServerCache.cpp | |
| parent | First cut callback support (diff) | |
| parent | Added -D_STLP_NEW_PLATFORM_SDK for VC6 build (diff) | |
| download | ice-9b300be79e1feebd09f16e01adeb5a7a005cda2e.tar.bz2 ice-9b300be79e1feebd09f16e01adeb5a7a005cda2e.tar.xz ice-9b300be79e1feebd09f16e01adeb5a7a005cda2e.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Conflicts:
cpp/src/IceGrid/SessionServantManager.cpp
Diffstat (limited to 'cpp/src/IceGrid/ServerCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index 9e38578a356..d2f87fbc65e 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -421,8 +421,6 @@ ServerEntry::getAdminProxy() adminId.name = _id; adminId.category = _cache.getInstanceName() + "-NodeRouter"; - // TODO: what's this upToDate parameter about?? - try { return getProxy(true)->ice_identity(adminId); |