commit ebfe4a207f658a77b5249cda4bd0bc35ede82066
author Junxiao Shi <git@mail1.yoursunny.com> Sun Apr 01 23:53:40 2018 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Sun Apr 01 23:53:40 2018 +0000
tree cb27ce64b7efb130a1de3b9e6c9e1d5c6ba30d98
parent b849f61b6bc35a050cf3d1d15d07cf639b2732f1

meta-info: allow typed name component in FinalBlockId

refs #4526

Change-Id: I3b6667928fa47c631e45ff5f0ca2c5030c5cc2ad

src/util/segment-fetcher.cpp

diff --git a/src/util/segment-fetcher.cpp b/src/util/segment-fetcher.cpp
index b23b991..90cddaf 100644
--- a/src/util/segment-fetcher.cpp
+++ b/src/util/segment-fetcher.cpp
@@ -131,8 +131,8 @@
       m_buffer->write(reinterpret_cast<const char*>(data.getContent().value()),
                       data.getContent().value_size());
       afterSegmentValidated(data);
-      const name::Component& finalBlockId = data.getMetaInfo().getFinalBlockId();
-      if (finalBlockId.empty() || (finalBlockId > currentSegment)) {
+      const auto& finalBlockId = data.getFinalBlock();
+      if (!finalBlockId || (*finalBlockId > currentSegment)) {
         fetchNextSegment(origInterest, data.getName(), currentSegment.toSegment() + 1, self);
       }
       else {