[asterisk-commits] rmudgett: branch 1.6.1 r204837 - in /branches/1.6.1: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jul  2 17:05:07 2009
New Revision: 204837

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=204837
Log:
Merged revisions 204835 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r204835 | rmudgett | 2009-07-02 17:01:28 -0500 (Thu, 02 Jul 2009) | 17 lines
  
  Merged revisions 204834 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r204834 | rmudgett | 2009-07-02 16:59:43 -0500 (Thu, 02 Jul 2009) | 10 lines
    
    Removed confusing warning message "Got Busy in Connected State"
    
    If an incoming mISDN call is answered with the Answer application and a
    subsequent Dial gets a busy endpoint then it is valid for that already
    connected channel to get the busy indication.  Asterisk will play the busy
    tones until the dialplan plays something else or hangs up the call.
    
    (closes issue #11974)
    Reported by: fvdb
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_misdn.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_misdn.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_misdn.c?view=diff&rev=204837&r1=204836&r2=204837
==============================================================================
--- branches/1.6.1/channels/chan_misdn.c (original)
+++ branches/1.6.1/channels/chan_misdn.c Thu Jul  2 17:05:07 2009
@@ -2645,8 +2645,6 @@
 		if (p->state != MISDN_CONNECTED) {
 			start_bc_tones(p);
 			misdn_lib_send_event( p->bc, EVENT_DISCONNECT);
-		} else {
-			chan_misdn_log(-1, p->bc->port, " --> !! Got Busy in Connected State !?! ast:%s\n", ast->name);
 		}
 		return -1;
 	case AST_CONTROL_RING: