[asterisk-commits] qwell: branch 1.6.0 r114135 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Apr 15 11:19:06 2008
New Revision: 114135

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

................
r114134 | qwell | 2008-04-15 11:18:38 -0500 (Tue, 15 Apr 2008) | 16 lines

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

........
r114133 | qwell | 2008-04-15 11:18:08 -0500 (Tue, 15 Apr 2008) | 8 lines

Allow autofill to work in the general section of queues.conf.
Additionally, don't try to (re)set options when they have empty values in realtime (all unset columns would have an empty value).

(closes issue #12445)
Reported by: atis
Patches:
      12445-autofill.diff uploaded by qwell (license 4)

........

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

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

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

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=114135&r1=114134&r2=114135
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Tue Apr 15 11:19:06 2008
@@ -938,7 +938,6 @@
 	q->monfmt[0] = '\0';
 	q->reportholdtime = 0;
 	q->wrapuptime = 0;
-	q->autofill = 0;
 	q->joinempty = 0;
 	q->leavewhenempty = 0;
 	q->memberdelay = 0;
@@ -1525,7 +1524,11 @@
 				*tmp++ = '-';
 		} else
 			tmp_name = v->name;
-		queue_set_param(q, tmp_name, v->value, -1, 0);
+
+		if (!ast_strlen_zero(v->value)) {
+			/* Don't want to try to set the option if the value is empty */
+			queue_set_param(q, tmp_name, v->value, -1, 0);
+		}
 	}
 
 	/* Temporarily set realtime members dead so we can detect deleted ones.