From 68626bbbbd34504d6562f52699f3dfa8051ffcec Mon Sep 17 00:00:00 2001 From: Eliot Gable Date: Thu, 3 Jan 2013 23:07:54 +0000 Subject: [PATCH] Fix segfault on shut down of SQL queue manager in rare case where registration cleanup is firing at the same time the queue manager is shutting down. --- src/switch_core_sqldb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index 802ce6b28a..6642ab311a 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -3251,14 +3251,13 @@ void switch_core_sqldb_stop(void) switch_event_unbind_callback(core_event_handler); - switch_core_sqldb_stop_thread(); - - if (sql_manager.db_thread && sql_manager.db_thread_running) { sql_manager.db_thread_running = -1; switch_thread_join(&st, sql_manager.db_thread); } + switch_core_sqldb_stop_thread(); + switch_cache_db_flush_handles(); sql_close(0); }