From f7d78f8626089baec961c312dbf345ed8f582965 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 1 Nov 2008 16:18:04 +0000 Subject: [PATCH] move logic down a step git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10216 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core_rwlock.c | 2 +- src/switch_core_session.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/switch_core_rwlock.c b/src/switch_core_rwlock.c index 11db1057b9..a7cb9d77fe 100644 --- a/src/switch_core_rwlock.c +++ b/src/switch_core_rwlock.c @@ -45,7 +45,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_lock(switch_core_sessio switch_status_t status = SWITCH_STATUS_FALSE; if (session->rwlock) { - if (switch_test_flag(session, SSF_DESTROYED)) { + if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_get_state(session->channel) >= CS_HANGUP) { status = SWITCH_STATUS_FALSE; #ifdef SWITCH_DEBUG_RWLOCKS switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock FAIL\n", diff --git a/src/switch_core_session.c b/src/switch_core_session.c index d6ddd5e18a..76a9aab689 100644 --- a/src/switch_core_session.c +++ b/src/switch_core_session.c @@ -57,11 +57,9 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(const char *u if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) { /* Acquire a read lock on the session */ #ifdef SWITCH_DEBUG_RWLOCKS - if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_test_flag(session, SSF_DESTROYED) || - switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { + if (switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { #else - if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_test_flag(session, SSF_DESTROYED) || - switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { + if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { #endif /* not available, forget it */ session = NULL;