update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / beast / core / impl / basic_stream.hpp

diff --git a/ceph/src/boost/boost/beast/core/impl/basic_stream.hpp b/ceph/src/boost/boost/beast/core/impl/basic_stream.hpp
index 4cb5058ad168c380d9c750ab6c8f0be63862a872..0e70f7cefb4a953be080021ee3b44437bcb7b00e 100644 (file)
--- a/ceph/src/boost/boost/beast/core/impl/basic_stream.hpp
+++ b/ceph/src/boost/boost/beast/core/impl/basic_stream.hpp
@@ -143,21 +143,19 @@ template<class Protocol, class Executor, class RatePolicy>
 void
 basic_stream<Protocol, Executor, RatePolicy>::
 impl_type::
-close()
+close() noexcept
 {
     {
         error_code ec;
         socket.close(ec);
     }
-    timer.cancel();
-
-
-    // have to let the read/write ops cancel the timer,
-    // otherwise we will get error::timeout on close when
-    // we actually want net::error::operation_aborted.
-    //
-    //read.timer.cancel();
-    //write.timer.cancel();
+    try
+    {
+        timer.cancel();
+    }
+    catch(...)
+    {
+    }
 }
 
 //------------------------------------------------------------------------------