Add asserts while inserting/erasing from client maps in IFMapServer.

Add asserts while inserting/erasing from client maps in IFMapServer

Change-Id: Ib105008246166a574d4b86bd8251f9a40832673d
Closes-Bug: #1577503
(cherry picked from commit 37853af)

src/ifmap/ifmap_server.cc

@@ -223,8 +223,14 @@ void IFMapServer::ClientRegister(IFMapClient *client) {
     }
     client_indexes_.set(index);
 
-    client_map_.insert(make_pair(client->identifier(), client));
-    index_map_.insert(make_pair(index, client));
+    std::pair<ClientMap::iterator, bool> cm_ret;
+    cm_ret = client_map_.insert(make_pair(client->identifier(), client));
+    assert(cm_ret.second);
+
+    std::pair<IndexMap::iterator, bool> im_ret;
+    im_ret = index_map_.insert(make_pair(index, client));
+    assert(im_ret.second);
+
     client->Initialize(exporter_.get(), index);
     queue_->Join(index);
     IFMAP_DEBUG(IFMapServerClientRegUnreg, "Register request for client ",
@@ -247,8 +253,10 @@ void IFMapServer::ClientUnregister(IFMapClient *client) {
     size_t index = client->index();
     sender_->CleanupClient(index);
     queue_->Leave(index);
-    index_map_.erase(index);
-    client_map_.erase(client->identifier());
+    ImSz_t iret = index_map_.erase(index);
+    assert(iret == 1);
+    CmSz_t cret = client_map_.erase(client->identifier());
+    assert(cret == 1);
     client_indexes_.reset(index);
 }
 

src/ifmap/ifmap_server.h

@@ -58,6 +58,7 @@ class IFMapServer {
     typedef std::map<int, IFMapClient *> IndexMap;
     typedef std::deque<ClientHistoryInfo> ClientHistory;
     typedef ClientMap::size_type CmSz_t;
+    typedef IndexMap::size_type ImSz_t;
     IFMapServer(DB *db, DBGraph *graph, boost::asio::io_service *io_service);
     virtual ~IFMapServer();