[asterisk-commits] mjordan: branch 11 r375469 - in /branches/11: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Mon Oct 29 21:22:20 2012
New Revision: 375469

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375469
Log:
Ensure that the Queue application tracks busy members in off nominal situations

There are a few code paths where the Queue application fails to count a paused
or in use queue member as being 'busy'.  This can cause callers to get stuck
in the Queue until a paused agent unpauses themselves.

(closes issue ASTERISK-20623)
Reported by: Bryan Walters
patches:
  app_queue.patch uploaded by Bryan Walters (license 5851)
........

Merged revisions 375450 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 375451 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    branches/11/   (props changed)
    branches/11/apps/app_queue.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_queue.c?view=diff&rev=375469&r1=375468&r2=375469
==============================================================================
--- branches/11/apps/app_queue.c (original)
+++ branches/11/apps/app_queue.c Mon Oct 29 21:22:20 2012
@@ -3518,6 +3518,7 @@
 			ast_cdr_busy(ast_channel_cdr(qe->chan));
 		}
 		tmp->stillgoing = 0;
+		(*busies)++;
 		return 0;
 	}
 
@@ -3548,6 +3549,7 @@
 				ast_cdr_busy(ast_channel_cdr(qe->chan));
 			}
 			tmp->stillgoing = 0;
+			(*busies)++;
 			return 0;
 		}
 	}