[C++]: add reset of subscription and counter caches to onClose for #717.

real-logic · Oct 12, 2019 · f9a9a64 · f9a9a64
1 parent f53d3b5
commit f9a9a64
Showing 1 changed file with 10 additions and 0 deletions.
diff --git 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();