fix Assertion issue

openair2/RRC/LTE/rrc_eNB.c

@@ -7477,9 +7477,10 @@ rrc_eNB_decode_ccch(
 
               if ((ue_context_p = rrc_eNB_ue_context_stmsi_exist(ctxt_pP, mme_code, m_tmsi))) {
                 LOG_I(RRC," S-TMSI exists, ue_context_p %p, old rnti %x => %x\n",ue_context_p,ue_context_p->ue_context.rnti,ctxt_pP->rnti);
+                rnti_t      oldrnti = ue_context_p->ue_context.rnti;
 
                 if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
-                  rrc_mac_remove_ue(ctxt_pP->module_id, ue_context_p->ue_context.rnti);
+                  //rrc_mac_remove_ue(ctxt_pP->module_id, ue_context_p->ue_context.rnti);
                 }
                 else {
                   MessageDef *m = itti_alloc_new_message(TASK_RRC_ENB, F1AP_UE_CONTEXT_RELEASE_CMD);
@@ -7499,6 +7500,12 @@ rrc_eNB_decode_ccch(
                 ue_context_p->ue_id_rnti = ctxt_pP->rnti;
                 ue_context_p->ue_context.rnti = ctxt_pP->rnti;
                 RB_INSERT(rrc_ue_tree_s, &RC.rrc[ctxt_pP->module_id]->rrc_ue_head, ue_context_p);
+
+                /* release old rnti */
+                if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
+                  put_UE_in_freelist(ctxt_pP->module_id, oldrnti, 0);
+                }
+
                 /* reset timers */
                 ue_context_p->ue_context.ul_failure_timer = 0;
                 ue_context_p->ue_context.ue_release_timer = 0;