Fixed various bugs

4 files changed, 7 insertions, 7 deletions

diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index 4bf2c08e78a..5d8d7d936e5 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -74,7 +74,7 @@ AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const I
     //
     _servantManager = servantManager;
 
-    string category = "";
+    string category;
 
     if(con != 0)
     {
diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
index 0032d29bdfc..585ceaabeca 100644
--- a/cpp/src/IceGrid/SessionI.cpp
+++ b/cpp/src/IceGrid/SessionI.cpp
@@ -169,7 +169,7 @@ SessionI::_register(const SessionServantManagerPtr& servantManager, const Ice::C
     // This is supposed to be called after creation only, no need to synchronize.
     //
     _servantManager = servantManager;
-    return _servantManager->addSession(this, con, false);
+    return _servantManager->addSession(this, con, "");
 }
 
 void
diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp
index 23823caf4b7..8cbedf9b4f0 100644
--- a/cpp/src/IceGrid/SessionServantManager.cpp
+++ b/cpp/src/IceGrid/SessionServantManager.cpp
@@ -81,7 +81,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(category != "" && con != 0)
+    if(!category.empty() && con != 0)
     {
         _adminConnections.insert(con);
         _adminCallbackRouter->addMapping(category, con);
@@ -113,7 +113,7 @@ SessionServantManager::setSessionControl(const Ice::ObjectPtr& session,
     //
     // Allow invocations on server admin objects.
     //
-    if(p->second.category != "" && _serverAdminRouter) 
+    if(!p->second.category.empty() && _serverAdminRouter) 
     {
         Ice::StringSeq seq;
         seq.push_back(_serverAdminCategory);
@@ -179,12 +179,12 @@ SessionServantManager::removeSession(const Ice::ObjectPtr& session)
     // If this is an admin session, remove its connection from the admin connections.
     //
 
-    if(p->second.category != "" && p->second.connection)
+    if(!p->second.category.empty() && p->second.connection)
     {
         assert(_adminConnections.find(p->second.connection) != _adminConnections.end());
         _adminConnections.erase(_adminConnections.find(p->second.connection));
 
-        _adminConnections.erase(p->second.connection);
+        _adminCallbackRouter->removeMapping(p->second.category);
     }
 
     _sessions.erase(p);
diff --git a/cpp/src/IceGrid/SessionServantManager.h b/cpp/src/IceGrid/SessionServantManager.h
index c0901965cad..15f656937ac 100644
--- a/cpp/src/IceGrid/SessionServantManager.h
+++ b/cpp/src/IceGrid/SessionServantManager.h
@@ -32,7 +32,7 @@ public:
     void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
     void deactivate(const std::string&);
 
-    Ice::ObjectPrx addSession(const Ice::ObjectPtr&, const Ice::ConnectionPtr&, const std::string& = "");
+    Ice::ObjectPrx addSession(const Ice::ObjectPtr&, const Ice::ConnectionPtr&, const std::string&);
     void setSessionControl(const Ice::ObjectPtr&, const Glacier2::SessionControlPrx&, const Ice::IdentitySeq&);
     Glacier2::IdentitySetPrx getGlacier2IdentitySet(const Ice::ObjectPtr&);
     Glacier2::StringSetPrx getGlacier2AdapterIdSet(const Ice::ObjectPtr&);