]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
[mod_event_socket] Fix "Listener session is null" problem - regression from previous...
authorAndrey Volk <andywolk@gmail.com>
Wed, 13 Nov 2019 13:56:57 +0000 (17:56 +0400)
committerAndrey Volk <andywolk@gmail.com>
Wed, 13 Nov 2019 15:28:25 +0000 (19:28 +0400)
src/mod/event_handlers/mod_event_socket/mod_event_socket.c

index 192b81c1f48b906e32345a741e49f8d27086ecf4..c8d8a2350115f25f474ad64ea45874347a32346e 100644 (file)
@@ -2635,16 +2635,12 @@ static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj)
 
        switch_assert(listener != NULL);
 
-       if (!(session = listener->session)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Listener session is null!\n");
-               switch_clear_flag_locked(listener, LFLAG_RUNNING);
-               goto done;
-       }
-
-       if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unable to lock session!\n");
-               locked = 0;
-               goto done;
+       if ((session = listener->session)) {
+               if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unable to lock session!\n");
+                       locked = 0;
+                       goto done;
+               }
        }
 
        if (!listener->sock) {