From ad358300a9db59518f30860f9ab5d49093f5679e Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Thu, 26 Nov 2015 18:45:15 +0200 Subject: [PATCH] cql server: remove connection from notifiers earlier Remove connection from notifiers lists just before closing it to prevent attempts to send notification on already closed connection. --- transport/server.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport/server.cc b/transport/server.cc index 257b899934..0c0e4be9fe 100644 --- a/transport/server.cc +++ b/transport/server.cc @@ -427,7 +427,6 @@ cql_server::connection::connection(cql_server& server, connected_socket&& fd, so cql_server::connection::~connection() { --_server._current_connections; - _server._notifier->unregister_connection(this); _server._connections_list.erase(_server._connections_list.iterator_to(*this)); _server.maybe_idle(); } @@ -452,6 +451,7 @@ future<> cql_server::connection::process() return write_response(make_error(0, exceptions::exception_code::SERVER_ERROR, "unknown error")); } }).finally([this] { + _server._notifier->unregister_connection(this); return _pending_requests_gate.close().then([this] { return _ready_to_respond.finally([this] { return _write_buf.close();