commit ba3c1d16faec79a84ac615735bae0d1657bbfe18
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Oct 03 23:26:35 2012 -0700
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Oct 03 23:26:35 2012 -0700
tree e782b4d7501841ac380ca27773f372c0a0c58caa
parent a2e0b08f1d145b7949d17a8b59cba0f135b9707e

fix bug about forwarder node, seems to help with removal

model/sync-logic.cc

diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index 48c1d81..de7182e 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -293,7 +293,7 @@
           BOOST_ASSERT (diffLeaf != 0);
 
           NameInfoConstPtr info = diffLeaf->getInfo();
-          if (diffLeaf->getOperation() == UPDATE && info->toString() != forwarderPrefix)
+          if (diffLeaf->getOperation() == UPDATE)
             {
               SeqNo seq = diffLeaf->getSeq();
 
@@ -314,8 +314,12 @@
                   {
                     ++oldSeq;
                   }
-                  MissingDataInfo mdi = {info->toString(), oldSeq, seq};
-                  v.push_back(mdi);
+                  // there is no need for application to process update on forwarder node
+                  if (info->toString() != forwarderPrefix)
+                  {
+                    MissingDataInfo mdi = {info->toString(), oldSeq, seq};
+                    v.push_back(mdi);
+                  }
                 }
             }
           else if (diffLeaf->getOperation() == REMOVE)
@@ -328,7 +332,6 @@
             }
           else
             {
-              BOOST_ASSERT (info->toString() == forwarderPrefix); // just in case
             }
         }