diff options
| author | Håvard Pettersen <3535158+havardpe@users.noreply.github.com> | 2023-02-23 16:13:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 16:13:15 +0100 |
| commit | 688a57cac9e1700d5fc557ebc64e547f65ed5f1c (patch) | |
| tree | 16f105631d6acff9f1ee2be51ec77797bc6a8e11 | |
| parent | 9dffa2d7bea098e175d62a155460fe24d12b67f6 (diff) | |
| parent | 36c1197e86fdfab50c5e932ffad8002de5671c5f (diff) | |
Merge pull request #26166 from vespa-engine/havardpe/disallow-pending-resolves-on-delete
assert that there are no pending resolves when deleting
| -rw-r--r-- | fnet/src/vespa/fnet/connection.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fnet/src/vespa/fnet/connection.cpp b/fnet/src/vespa/fnet/connection.cpp index 26367c904b2..e344f2a22a6 100644 --- a/fnet/src/vespa/fnet/connection.cpp +++ b/fnet/src/vespa/fnet/connection.cpp @@ -475,7 +475,7 @@ FNET_Connection::FNET_Connection(FNET_TransportThread *owner, _streamer(streamer), _serverAdapter(serverAdapter), _socket(owner->owner().create_server_crypto_socket(std::move(socket))), - _resolve_handler(nullptr), + _resolve_handler(), _context(), _state(FNET_CONNECTING), _flags(owner->owner().getConfig()), @@ -506,7 +506,7 @@ FNET_Connection::FNET_Connection(FNET_TransportThread *owner, _streamer(streamer), _serverAdapter(serverAdapter), _socket(), - _resolve_handler(nullptr), + _resolve_handler(), _context(context), _state(FNET_CONNECTING), _flags(owner->owner().getConfig()), @@ -529,6 +529,7 @@ FNET_Connection::FNET_Connection(FNET_TransportThread *owner, FNET_Connection::~FNET_Connection() { + assert(!_resolve_handler); assert(_cleanup == nullptr); _num_connections.fetch_sub(1, std::memory_order_relaxed); } |