Author: brian Date: Tue Mar 3 18:06:52 2009 New Revision: 12402 Log: FSCORE-297 tony fixed this via telephone blind.. its not ME. Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 3 18:06:52 2009 @@ -1525,9 +1525,7 @@ 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; Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Mar 3 18:06:52 2009 @@ -762,7 +762,7 @@ 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_core_destroy_memory_pool(&TIMEZONES_LIST.pool); } - return SWITCH_STATUS_NOUNLOAD; + return SWITCH_STATUS_SUCCESS; }
participants (1)
-
FreeSWITCH SVN