kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Brian West 2009-03-04 00:06:52 +00:00
parent c673d8e914
commit 1908898362
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_core.c
View File

@ -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;

4
src/switch_time.c
View File

@ -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;
}