From cf03bbfde7ed10962c805b595836150ef6134152 Mon Sep 17 00:00:00 2001
From: Marco Miozzo <marco.miozzo@cttc.es>
Date: Mon, 26 Sep 2011 16:07:39 +0200
Subject: [PATCH] Bug-fix JIRA-152 m_a30CqiRxed lookup in
 PfFfMacScheduler::DoSchedDlTriggerReq

---
 src/lte/model/pf-ff-mac-scheduler.cc | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc
index 40ef9de96..22ce9ab1f 100644
--- a/src/lte/model/pf-ff-mac-scheduler.cc
+++ b/src/lte/model/pf-ff-mac-scheduler.cc
@@ -520,22 +520,28 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
       itCqi = m_a30CqiRxed.find ((*itMap).first);
-      NS_ASSERT_MSG (itCqi != m_a30CqiRxed.end (), "element not found in m_a30CqiRxed ");
       uint8_t worstCqi = 15;
-      for (uint16_t k = 0; k < (*itMap).second.size (); k++)
+      if (itCqi != m_a30CqiRxed.end ())
         {
-          if ((*itCqi).second.m_higherLayerSelected.size () > (*itMap).second.at (k))
+          for (uint16_t k = 0; k < (*itMap).second.size (); k++)
             {
-//             NS_LOG_DEBUG (this << " RBG " << (*itMap).second.at (k) << " CQI " << (uint16_t)((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0)) );
-              if (((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0)) < worstCqi)
+              if ((*itCqi).second.m_higherLayerSelected.size () > (*itMap).second.at (k))
                 {
-                  worstCqi = ((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0));
+    //             NS_LOG_DEBUG (this << " RBG " << (*itMap).second.at (k) << " CQI " << (uint16_t)((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0)) );
+                  if (((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0)) < worstCqi)
+                    {
+                      worstCqi = ((*itCqi).second.m_higherLayerSelected.at ((*itMap).second.at (k)).m_sbCqi.at (0));
+                    }
+                }
+              else
+                {
+                  worstCqi = 1; // try with lowest MCS in RBG with no info on channel
                 }
             }
-          else
-            {
-              worstCqi = 1; // try with lowest MCS in RBG with no info on channel
-            }
+        }
+      else
+        {
+          worstCqi = 1; // try with lowest MCS in RBG with no info on channel
         }
 //       NS_LOG_DEBUG (this << " CQI " << (uint16_t)worstCqi);
       newDci.m_mcs.push_back (LteAmc::GetMcsFromCqi (worstCqi));