[svn-commits] russell: branch 1.6.1 r208595 - in /branches/1.6.1: ./ apps/app_dial.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Jul 24 13:52:52 2009
New Revision: 208595

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

................
  r208593 | russell | 2009-07-24 13:42:32 -0500 (Fri, 24 Jul 2009) | 14 lines
  
  Merged revisions 208592 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r208592 | russell | 2009-07-24 13:38:24 -0500 (Fri, 24 Jul 2009) | 7 lines
    
    Do not log an ERROR if autoservice_stop() returns -1.
    
    This does not indicate an error.  A return of -1 just means that the channel
    has been hung up.
    
    (reported in #asterisk-dev)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_dial.c

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

Modified: branches/1.6.1/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_dial.c?view=diff&rev=208595&r1=208594&r2=208595
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Fri Jul 24 13:52:52 2009
@@ -1770,7 +1770,6 @@
 			}
 
 			if (ast_autoservice_stop(chan) < 0) {
-				ast_log(LOG_ERROR, "Could not stop autoservice on calling channel\n");
 				res = -1;
 			}