commit e3e2505aa03e0b298e1a8dfc9876f1f8dafcaaba
author Eric Newberry <enewberry@email.arizona.edu> Sat Nov 28 20:37:08 2015 -0700
committer Eric Newberry <enewberry@email.arizona.edu> Sun Nov 29 16:25:36 2015 -0700
tree 0549fe448948ed0b5afb503e5ea14de33516c8a7
parent 664dc03fa6f7132fe71f4d61130ddbb818db3557

face: remove try-catch in DummyClientFace::construct

refs #2930

Change-Id: I2639c9c37eb8104d61a61ffc515caabee99807c5

src/util/dummy-client-face.cpp

diff --git a/src/util/dummy-client-face.cpp b/src/util/dummy-client-face.cpp
index 1bfce8f..676a7a0 100644
--- a/src/util/dummy-client-face.cpp
+++ b/src/util/dummy-client-face.cpp
@@ -101,47 +101,42 @@
 DummyClientFace::construct(const Options& options)
 {
   m_transport->onSendBlock.connect([this] (const Block& blockFromDaemon) {
-    try {
-      Block packet(blockFromDaemon);
-      packet.encode();
-      lp::Packet lpPacket(packet);
+    Block packet(blockFromDaemon);
+    packet.encode();
+    lp::Packet lpPacket(packet);
 
-      Buffer::const_iterator begin, end;
-      std::tie(begin, end) = lpPacket.get<lp::FragmentField>();
-      Block block(&*begin, std::distance(begin, end));
+    Buffer::const_iterator begin, end;
+    std::tie(begin, end) = lpPacket.get<lp::FragmentField>();
+    Block block(&*begin, std::distance(begin, end));
 
-      if (block.type() == tlv::Interest) {
-        shared_ptr<Interest> interest = make_shared<Interest>(block);
-        if (lpPacket.has<lp::NackField>()) {
-          shared_ptr<lp::Nack> nack = make_shared<lp::Nack>(std::move(*interest));
-          nack->setHeader(lpPacket.get<lp::NackField>());
-          if (lpPacket.has<lp::NextHopFaceIdField>()) {
-            nack->getLocalControlHeader().setNextHopFaceId(lpPacket.get<lp::NextHopFaceIdField>());
-          }
-          onSendNack(*nack);
+    if (block.type() == tlv::Interest) {
+      shared_ptr<Interest> interest = make_shared<Interest>(block);
+      if (lpPacket.has<lp::NackField>()) {
+        shared_ptr<lp::Nack> nack = make_shared<lp::Nack>(std::move(*interest));
+        nack->setHeader(lpPacket.get<lp::NackField>());
+        if (lpPacket.has<lp::NextHopFaceIdField>()) {
+          nack->getLocalControlHeader().setNextHopFaceId(lpPacket.get<lp::NextHopFaceIdField>());
         }
-        else {
-          if (lpPacket.has<lp::NextHopFaceIdField>()) {
-            interest->getLocalControlHeader().
-              setNextHopFaceId(lpPacket.get<lp::NextHopFaceIdField>());
-          }
-          onSendInterest(*interest);
-        }
+        onSendNack(*nack);
       }
-      else if (block.type() == tlv::Data) {
-        shared_ptr<Data> data = make_shared<Data>(block);
-
-        if (lpPacket.has<lp::CachePolicyField>()) {
-          if (lpPacket.get<lp::CachePolicyField>().getPolicy() == lp::CachePolicyType::NO_CACHE) {
-            data->getLocalControlHeader().setCachingPolicy(nfd::LocalControlHeader::CachingPolicy::NO_CACHE);
-          }
+      else {
+        if (lpPacket.has<lp::NextHopFaceIdField>()) {
+          interest->getLocalControlHeader().
+            setNextHopFaceId(lpPacket.get<lp::NextHopFaceIdField>());
         }
-
-        onSendData(*data);
+        onSendInterest(*interest);
       }
     }
-    catch (tlv::Error& e) {
-      throw tlv::Error("Error decoding NDNLPv2 packet");
+    else if (block.type() == tlv::Data) {
+      shared_ptr<Data> data = make_shared<Data>(block);
+
+      if (lpPacket.has<lp::CachePolicyField>()) {
+        if (lpPacket.get<lp::CachePolicyField>().getPolicy() == lp::CachePolicyType::NO_CACHE) {
+          data->getLocalControlHeader().setCachingPolicy(nfd::LocalControlHeader::CachingPolicy::NO_CACHE);
+        }
+      }
+
+      onSendData(*data);
     }
   });