move logic down a step

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10216 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_core_rwlock.c b/src/switch_core_rwlock.c
index 11db1057b99ddf69d776b92b72be82a2798f1f35..a7cb9d77fe7ff1722f092df36d64fadf0083d1f8 100644 (file)
--- 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 d6ddd5e18a6f9c765f9b9747bb13f24684a6f600..76a9aab68981452ca11f029a39d4ad474a337054 100644 (file)
--- 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;