Fixed minor IceGrid bugs

2 files changed, 2 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);
     }