Clear shutdown callchain after exec callbacks

ARMmbed · Dec 16, 2015 · 0024b78 · 0024b78
1 parent 0781293
commit 0024b78
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/ble/Gap.h b/ble/Gap.h
@@ -1047,6 +1047,7 @@ class Gap {
     virtual ble_error_t reset(void) {
         /* Notify that the instance is about to shutdown */
         shutdownCallChain.call(this);
+        shutdownCallChain.clear();
 
         /* Clear Gap state */
         state.advertising = 0;

diff --git a/ble/GattClient.h b/ble/GattClient.h
@@ -376,6 +376,7 @@ class GattClient {
     virtual ble_error_t reset(void) {
         /* Notify that the instance is about to shutdown */
         shutdownCallChain.call(this);
+        shutdownCallChain.clear();
 
         onDataReadCallbackChain.clear();
         onDataWriteCallbackChain.clear();

diff --git a/ble/GattServer.h b/ble/GattServer.h
@@ -447,6 +447,7 @@ class GattServer {
     virtual ble_error_t reset(void) {
         /* Notify that the instance is about to shutdown */
         shutdownCallChain.call(this);
+        shutdownCallChain.clear();
 
         serviceCount = 0;
         characteristicCount = 0;

diff --git a/ble/SecurityManager.h b/ble/SecurityManager.h
@@ -284,6 +284,7 @@ class SecurityManager {
     virtual ble_error_t reset(void) {
         /* Notify that the instance is about to shutdown */
         shutdownCallChain.call(this);
+        shutdownCallChain.clear();
 
         securitySetupInitiatedCallback = NULL;
         securitySetupCompletedCallback = NULL;