From 3545904ede8f5baba4c4d7f25d6e7b8b414632bc Mon Sep 17 00:00:00 2001 From: "Todd L. Montgomery" Date: Sat, 12 Oct 2019 11:01:38 -0700 Subject: [PATCH] [C++]: add reset of subscription and counter caches to onClose for #717. --- aeron-client/src/main/cpp/ClientConductor.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/aeron-client/src/main/cpp/ClientConductor.cpp b/aeron-client/src/main/cpp/ClientConductor.cpp index abcd0890724..3d8c376d83d 100644 --- a/aeron-client/src/main/cpp/ClientConductor.cpp +++ b/aeron-client/src/main/cpp/ClientConductor.cpp @@ -935,6 +935,11 @@ void ClientConductor::closeAllResources(long long nowMs) CallbackGuard callbackGuard(m_isInCallback); kv.second.m_onUnavailableImageHandler(image); } + + if (kv.second.m_subscriptionCache) + { + kv.second.m_subscriptionCache.reset(); + } } } m_subscriptionByRegistrationId.clear(); @@ -954,6 +959,11 @@ void ClientConductor::closeAllResources(long long nowMs) CallbackGuard callbackGuard(m_isInCallback); handler(m_countersReader, registrationId, counterId); } + + if (kv.second.m_counterCache) + { + kv.second.m_counterCache.reset(); + } } } m_counterByRegistrationId.clear();