From 4bd8a6df41e1389c00dfb363d4ff85898a63609d Mon Sep 17 00:00:00 2001
From: ZorazeAli <zoraze.ali@cttc.es>
Date: Wed, 10 Apr 2019 16:43:23 +0200
Subject: [PATCH] lte: Erase all the maps in eNB CC manger upon UE removel

---
 src/lte/model/no-op-component-carrier-manager.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/lte/model/no-op-component-carrier-manager.cc b/src/lte/model/no-op-component-carrier-manager.cc
index 59e08989c..7caa6d678 100644
--- a/src/lte/model/no-op-component-carrier-manager.cc
+++ b/src/lte/model/no-op-component-carrier-manager.cc
@@ -210,6 +210,18 @@ NoOpComponentCarrierManager::DoRemoveUe (uint16_t rnti)
   NS_ASSERT_MSG (stateIt != m_ueState.end (), "request to remove UE info with unknown rnti ");
   NS_ASSERT_MSG (eccIt != m_enabledComponentCarrier.end (), "request to remove UE info with unknown rnti ");
 
+  //std::map <uint16_t, std::map<uint8_t, LteEnbCmacSapProvider::LcInfo> >::iterator lcsIt;
+  auto rlcLcIt = m_rlcLcInstantiated.find (rnti);
+  NS_ASSERT_MSG (rlcLcIt != m_rlcLcInstantiated.end (), "request to Release Data Radio Bearer on UE without Logical Channels enabled");
+
+  auto rntiIt = m_ueAttached.find (rnti);
+
+  NS_ASSERT_MSG (rntiIt != m_ueAttached.end (), "request to Release Data Radio Bearer on unattached UE");
+
+  m_ueState.erase (rnti);
+  m_enabledComponentCarrier.erase (rnti);
+  m_rlcLcInstantiated.erase (rnti);
+  m_ueAttached.erase (rnti);
 }
 
 std::vector<LteCcmRrcSapProvider::LcsConfig>