[svn-commits] mmichelson: branch 1.6.0 r162268 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Dec  9 14:31:21 2008
New Revision: 162268

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162268
Log:
Merged revisions 162266 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r162266 | mmichelson | 2008-12-09 14:30:07 -0600 (Tue, 09 Dec 2008) | 14 lines

Merged revisions 162265 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r162265 | mmichelson | 2008-12-09 14:28:44 -0600 (Tue, 09 Dec 2008) | 6 lines

If we fail to start a thread for the pbx to run in, we need to
be sure to decrease the number of active calls on the system.

This fix may relate to ABE-1713, but it is not certain yet.


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

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

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=162268&r1=162267&r2=162268
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Tue Dec  9 14:31:21 2008
@@ -3976,6 +3976,7 @@
 	/* Start a new thread, and get something handling this channel. */
 	if (ast_pthread_create_detached(&t, NULL, pbx_thread, c)) {
 		ast_log(LOG_WARNING, "Failed to create new channel thread\n");
+		decrease_call_count();
 		return AST_PBX_FAILED;
 	}