commit 9630fbf4e03eaa91f7f7ed1e531b8bba1847fcba
author Vince Lehman <vslehman@memphis.edu> Tue May 05 12:33:44 2015 -0500
committer Vince Lehman <vslehman@memphis.edu> Sat May 09 11:13:42 2015 -0700
tree 1b2ad62cabab05e1ef2b500bcbeb614cb52528b9
parent a6f3e645f51da5fa4ecde44e6b84d991c2da9d95

route: Fix component appending in NamePrefixTable::removeEntry

refs: #2322

Change-Id: I511414be322dccc713d3eaef737edd87a51e8b51

src/route/name-prefix-table.cpp

diff --git a/src/route/name-prefix-table.cpp b/src/route/name-prefix-table.cpp
index 5db64d3..ba7dd75 100644
--- a/src/route/name-prefix-table.cpp
+++ b/src/route/name-prefix-table.cpp
@@ -81,15 +81,17 @@
                                                               m_table.end(),
                                                               ndn::bind(&npteCompare, _1, name));
   if (it != m_table.end()) {
-    ndn::Name destRouter = rte.getDestination();
-    (*it).removeRoutingTableEntry(rte);
-    if (((*it).getRteListSize() == 0) &&
-        (!m_nlsr.getLsdb().doesLsaExist(destRouter.append("/" + NameLsa::TYPE_STRING),
-                                        (NameLsa::TYPE_STRING))) &&
-        (!m_nlsr.getLsdb().doesLsaExist(destRouter.append("/" + AdjLsa::TYPE_STRING),
-                                        (AdjLsa::TYPE_STRING))) &&
-        (!m_nlsr.getLsdb().doesLsaExist(destRouter.append("/" + CoordinateLsa::TYPE_STRING),
-                                        (CoordinateLsa::TYPE_STRING)))) {
+    const ndn::Name destRouter = rte.getDestination();
+    it->removeRoutingTableEntry(rte);
+
+    if (it->getRteListSize() == 0 &&
+        !m_nlsr.getLsdb().doesLsaExist(ndn::Name(destRouter).append(NameLsa::TYPE_STRING),
+                                       NameLsa::TYPE_STRING) &&
+        !m_nlsr.getLsdb().doesLsaExist(ndn::Name(destRouter).append(AdjLsa::TYPE_STRING),
+                                       AdjLsa::TYPE_STRING) &&
+        !m_nlsr.getLsdb().doesLsaExist(ndn::Name(destRouter).append(CoordinateLsa::TYPE_STRING),
+                                       CoordinateLsa::TYPE_STRING))
+    {
       m_table.erase(it);
       m_nlsr.getFib().remove(name);
     }