commit 08d07a764e074f687399ba39ed2ee1e30cede1d8
author Junxiao Shi <git@mail1.yoursunny.com> Mon Jun 09 23:17:57 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Tue Jun 10 20:41:42 2014 -0700
tree 66146915524b5591bd52d629b96b4a9423df2b5e
parent 281b916a35ca1a0328eb84f76a90ca6cee50f00a

face: avoid multiple onFail events

refs #1497

Change-Id: I8fda3fea5cd8a314b30eef45da104109e9748afc

daemon/face/stream-face.hpp

diff --git a/daemon/face/stream-face.hpp b/daemon/face/stream-face.hpp
index daf8ddf..12cc2bc 100644
--- a/daemon/face/stream-face.hpp
+++ b/daemon/face/stream-face.hpp
@@ -1,11 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014  Regents of the University of California,
- *                     Arizona Board of Regents,
- *                     Colorado State University,
- *                     University Pierre & Marie Curie, Sorbonne University,
- *                     Washington University in St. Louis,
- *                     Beijing Institute of Technology
+ * Copyright (c) 2014,  Regents of the University of California,
+ *                      Arizona Board of Regents,
+ *                      Colorado State University,
+ *                      University Pierre & Marie Curie, Sorbonne University,
+ *                      Washington University in St. Louis,
+ *                      Beijing Institute of Technology,
+ *                      The University of Memphis
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -211,7 +212,7 @@
                << "] Close connection");
 
   closeSocket();
-  this->onFail("Close connection");
+  this->fail("Close connection");
 }
 
 template<class T, class U>
@@ -223,7 +224,7 @@
 
   if (!m_socket->is_open())
     {
-      this->onFail("Connection closed");
+      this->fail("Connection closed");
       return;
     }
 
@@ -245,11 +246,11 @@
 
   if (error == boost::asio::error::eof)
     {
-      this->onFail("Connection closed");
+      this->fail("Connection closed");
     }
   else
     {
-      this->onFail("Send or receive operation failed, closing socket: " +
+      this->fail("Send or receive operation failed, closing socket: " +
                    error.category().message(error.value()));
     }
 }
@@ -327,7 +328,7 @@
                    << "closing down the face");
 
       closeSocket();
-      this->onFail("Failed to parse incoming packet or it is too large to process, "
+      this->fail("Failed to parse incoming packet or it is too large to process, "
                    "closing down the face");
       return;
     }