FS-5769 --resolve

diff --git a/src/switch_core.c b/src/switch_core.c
index 7782265dc311f0f244990b50173698c2dffae17a..2f6cd7b0234e4ae8b6ba2e4cf6888027254ea69d 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -28,7 +28,7 @@
  * Paul D. Tinsley <pdt at jackhammer.org>
  * Marcel Barbulescu <marcelbarbulescu@gmail.com>
  * Joseph Sullivan <jossulli@amazon.com>
- *
+ * Seven Du <dujinfang@gmail.com>
  *
  * switch_core.c -- Main Core Library
  *
@@ -1691,13 +1691,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
        }
 
        switch_log_init(runtime.memory_pool, runtime.colorize_console);
-
-       if (flags & SCF_MINIMAL) return SWITCH_STATUS_SUCCESS;
                        
        runtime.tipping_point = 0;
        runtime.timer_affinity = -1;
        runtime.microseconds_per_tick = 20000;
 
+       if (flags & SCF_MINIMAL) return SWITCH_STATUS_SUCCESS;
+
        switch_load_core_config("switch.conf");
 
        switch_core_state_machine_init(runtime.memory_pool);
@@ -1970,7 +1970,7 @@ static void switch_load_core_config(const char *file)
 
                                        if (!runtime.events_use_dispatch) {
                                                runtime.events_use_dispatch = 1;
-                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, 
+                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
                                                                                  "Implicitly setting events-use-dispatch based on usage of this initial-event-threads parameter.\n");
                                        }
 

diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 833d7f0b46cdc554d2eb8e45bc970e367e30757b..9b5d7d62ec55391f23dd7d012b92410d6d5b3f31 100644 (file)
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -24,7 +24,7 @@
  * Contributor(s):
  * 
  * Anthony Minessale II <anthm@freeswitch.org>
- *
+ * Seven Du <dujinfang@gmail.com>
  *
  * switch_loadable_module.c -- Loadable Modules
  *
@@ -1732,10 +1732,11 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo
        switch_core_hash_init_nocase(&loadable_modules.dialplan_hash, loadable_modules.pool);
        switch_mutex_init(&loadable_modules.mutex, SWITCH_MUTEX_NESTED, loadable_modules.pool);
 
+       if (!autoload) return SWITCH_STATUS_SUCCESS;
+
        switch_loadable_module_load_module("", "CORE_SOFTTIMER_MODULE", SWITCH_FALSE, &err);
        switch_loadable_module_load_module("", "CORE_PCM_MODULE", SWITCH_FALSE, &err);
 
-       if (!autoload) return SWITCH_STATUS_SUCCESS;
 
        if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
                switch_xml_t mods, ld;