[(no branch, rebasing 1798-remove-tls-stream-clear-operation)] [#1798] Reapplied...

diff --git a/src/lib/http/connection_pool.cc b/src/lib/http/connection_pool.cc
index 16cb54f5a01003f960c3791413f35544e321a92d..de92eb20e6bbc9a959c6733d1ce52f3882c8ee15 100644 (file)
--- a/src/lib/http/connection_pool.cc
+++ b/src/lib/http/connection_pool.cc
@@ -39,7 +39,13 @@ HttpConnectionPool::stop(const HttpConnectionPtr& connection) {
 
 void
 HttpConnectionPool::shutdown(const HttpConnectionPtr& connection) {
-    connections_.remove(connection);
+    if (util::MultiThreadingMgr::instance().getMode()) {
+        std::lock_guard<std::mutex> lk(mutex_);
+        connections_.remove(connection);
+    } else {
+        connections_.remove(connection);
+    }
+
     connection->shutdown();
 }