[asterisk-commits] file: trunk r73317 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Jul  5 08:23:49 2007
New Revision: 73317

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73317
Log:
Merged revisions 73316 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r73316 | file | 2007-07-05 10:22:13 -0300 (Thu, 05 Jul 2007) | 10 lines

Merged revisions 73315 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r73315 | file | 2007-07-05 10:19:17 -0300 (Thu, 05 Jul 2007) | 2 lines

Reset ServicelevelPerf variable back to 0 if we are unable to calculate it each time... otherwise we will get previous values. (issue #10117 reported by noriyuki)

........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
            ('branch-1.2-merged' removed)

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=73317&r1=73316&r2=73317
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Jul  5 08:23:49 2007
@@ -4351,8 +4351,7 @@
 
 		/* List queue properties */
 		if (ast_strlen_zero(queuefilter) || !strcmp(q->name, queuefilter)) {
-			if (q->callscompleted > 0)
-				sl = 100 * ((float) q->callscompletedinsl / (float) q->callscompleted);
+			sl = ((q->callscompleted > 0) ? 100 * ((float)q->callscompletedinsl / (float)q->callscompleted) : 0);
 			astman_append(s, "Event: QueueParams\r\n"
 				"Queue: %s\r\n"
 				"Max: %d\r\n"