提交 19088983 authored 作者: Brian West's avatar Brian West

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
上级 c673d8e9
...@@ -1525,9 +1525,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void) ...@@ -1525,9 +1525,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
if (runtime.memory_pool) { if (runtime.memory_pool) {
apr_pool_destroy(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; return switch_test_flag((&runtime), SCF_RESTART) ? SWITCH_STATUS_RESTART : SWITCH_STATUS_SUCCESS;
......
...@@ -762,7 +762,7 @@ SWITCH_MODULE_LOAD_FUNCTION(softtimer_load) ...@@ -762,7 +762,7 @@ SWITCH_MODULE_LOAD_FUNCTION(softtimer_load)
timer_interface->timer_destroy = timer_destroy; timer_interface->timer_destroy = timer_destroy;
/* indicate that the module should continue to be loaded */ /* indicate that the module should continue to be loaded */
return SWITCH_STATUS_NOUNLOAD; return SWITCH_STATUS_SUCCESS;
} }
SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown) SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown)
...@@ -790,7 +790,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown) ...@@ -790,7 +790,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(softtimer_shutdown)
switch_core_destroy_memory_pool(&TIMEZONES_LIST.pool); switch_core_destroy_memory_pool(&TIMEZONES_LIST.pool);
} }
return SWITCH_STATUS_NOUNLOAD; return SWITCH_STATUS_SUCCESS;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论