# This is a combination of 2 commits.

# The first commit's message is:

FS-7166 #resolve

# This is the 2nd commit message:

revert
This commit is contained in:
Anthony Minessale authored and Michael Jerris committed 2015-05-28 12:46:54 -05:00
1 parent f110ce40e2
commit 6789f37b39
3 files changed
+5 -22

No files matched your search

-7
View File
@@ -1655,13 +1655,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_medi
status = SWITCH_STATUS_SUCCESS;
channel = switch_core_session_get_channel(session);
if (switch_channel_test_flag(channel, CF_SECURE)) {
switch_core_session_rwunlock(session);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
"Cannot bypass %s due to secure connection.\n", switch_channel_get_name(channel));
return SWITCH_STATUS_FALSE;
}
if (switch_channel_test_flag(channel, CF_MEDIA_TRANS)) {
switch_core_session_rwunlock(session);
return SWITCH_STATUS_INUSE;