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

diff --git a/src/switch_core.c b/src/switch_core.c
index a1a7736105bb4a241b089de1562f3df23862cb86..88348213564b3a9b539133720f2bae23c56539da 100644 (file)
--- 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 018d46668f5e828f64a527e9d46b073ac16dc551..d20f9a293eaf38b6cbcd0a71b070f7c91f80018c 100644 (file)
--- 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;
 }