diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-11-27 20:47:17 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-11-27 20:47:17 +0100 |
| commit | a5b3d27c581d6fa10d1b681db0ec2602725af426 (patch) | |
| tree | ddaf8ec7443ce8714cc6e9e819c00db1f9f196bf /cpp | |
| parent | Fix a couple of typos (diff) | |
| download | ice-a5b3d27c581d6fa10d1b681db0ec2602725af426.tar.bz2 ice-a5b3d27c581d6fa10d1b681db0ec2602725af426.tar.xz ice-a5b3d27c581d6fa10d1b681db0ec2602725af426.zip | |
Fixed minor IceGrid bugs
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/SessionServantManager.cpp | 4 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/session/run.py | 2 |
3 files changed, 4 insertions, 4 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); diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp index 5002e9ac0a2..8a8664e9b30 100644 --- a/cpp/src/IceGrid/SessionServantManager.cpp +++ b/cpp/src/IceGrid/SessionServantManager.cpp @@ -78,7 +78,7 @@ SessionServantManager::addSession(const Ice::ObjectPtr& session, const Ice::Conn // Keep track of all the connections which have an admin session to allow access // to server admin objects. // - if(admin) + if(admin && con) { _adminConnections.insert(con); } @@ -174,7 +174,7 @@ SessionServantManager::removeSession(const Ice::ObjectPtr& session) // // If this is an admin session, remove its connection from the admin connections. // - if(p->second.admin) + if(p->second.admin && p->second.connection) { _adminConnections.erase(p->second.connection); } diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index 8643ca13827..1a513cfd304 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/run.py @@ -44,6 +44,8 @@ print "ok" IceGridAdmin.registryOptions += \ r' --IceGrid.Registry.DynamicRegistration' + \ + r' --IceGrid.Registry.SessionFilters' + \ + r' --IceGrid.Registry.AdminSessionFilters' + \ r' --IceGrid.Registry.PermissionsVerifier="ClientPermissionsVerifier"' + \ r' --IceGrid.Registry.AdminPermissionsVerifier="AdminPermissionsVerifier:tcp -p 12002"'+ \ r' --IceGrid.Registry.SSLPermissionsVerifier="SSLPermissionsVerifier"' |