From 1908898362f3c5b09f14eb0bf3712ee0733369ed Mon Sep 17 00:00:00 2001 From: Brian West Date: Wed, 4 Mar 2009 00:06:52 +0000 Subject: [PATCH] FSCORE-297 tony fixed this via telephone blind.. its not ME. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12402 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core.c | 4 +--- src/switch_time.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/switch_core.c b/src/switch_core.c index a1a7736105..8834821356 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -1525,9 +1525,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void) if (runtime.memory_pool) { apr_pool_destroy(runtime.memory_pool); - if (switch_test_flag((&runtime), SCF_RESTART)) { - apr_terminate(); - } + apr_terminate(); } return switch_test_flag((&runtime), SCF_RESTART) ? SWITCH_STATUS_RESTART : SWITCH_STATUS_SUCCESS; diff --git a/src/switch_time.c b/src/switch_time.c index 018d46668f..d20f9a293e 100644 --- a/src/switch_time.c +++ b/src/switch_time.c @@ -762,7 +762,7 @@ SWITCH_MODULE_LOAD_FUNCTION(softtimer_load) timer_interface->timer_destroy = timer_destroy; /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_NOUNLOAD; + return SWITCH_STATUS_SUCCESS; } SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown) @@ -790,7 +790,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown) switch_core_destroy_memory_pool(&TIMEZONES_LIST.pool); } - return SWITCH_STATUS_NOUNLOAD; + return SWITCH_STATUS_SUCCESS; }