commit 7465d5fc0c8863a0a9153bd006d3b50c41ef3cbf
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jul 07 10:19:42 2014 -0700
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Mon Jul 07 19:52:19 2014 -0700
tree 7b7a21df633c87e49ce736762874793c39e6489a
parent 0e173b7690dc67037dd9035f62898612e1036e84

face: Workaround to Boost.Asio bug 8795 with async_connect

Change-Id: I033a9ae719306f1af605124d982df60b9a8e7372
Refs: #1736

daemon/face/tcp-channel.cpp

diff --git a/daemon/face/tcp-channel.cpp b/daemon/face/tcp-channel.cpp
index 3986828..1d61709 100644
--- a/daemon/face/tcp-channel.cpp
+++ b/daemon/face/tcp-channel.cpp
@@ -207,7 +207,16 @@
 {
   scheduler::cancel(connectTimeoutEvent);
 
+#if (BOOST_VERSION == 105400)
+  // To handle regression in Boost 1.54
+  // https://svn.boost.org/trac/boost/ticket/8795
+  boost::system::error_code anotherErrorCode;
+  socket->remote_endpoint(anotherErrorCode);
+  if (error || anotherErrorCode) {
+#else
   if (error) {
+#endif
+
     if (error == boost::system::errc::operation_canceled) // when socket is closed by someone
       return;