[svn-commits] tilghman: trunk r287389 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Sep 17 16:10:02 2010
New Revision: 287389

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287389
Log:
Merged revisions 287388 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r287388 | tilghman | 2010-09-17 16:08:54 -0500 (Fri, 17 Sep 2010) | 21 lines
  
  Merged revisions 287387 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r287387 | tilghman | 2010-09-17 16:08:00 -0500 (Fri, 17 Sep 2010) | 14 lines
    
    Merged revisions 287386 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r287386 | tilghman | 2010-09-17 16:06:03 -0500 (Fri, 17 Sep 2010) | 7 lines
      
      Blank columns should get set on reload, not ignored.
      
      (closes issue #16893)
       Reported by: haakon
       Patches: 
             20100818__issue16893.diff.txt uploaded by tilghman (license 14)
    ........
  ................
................

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

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

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=287389&r1=287388&r2=287389
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Fri Sep 17 16:10:02 2010
@@ -2114,10 +2114,10 @@
 		} else
 			tmp_name = v->name;
 
-		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);
-		}
+		/* NULL values don't get returned from realtime; blank values should
+		 * still get set.  If someone doesn't want a value to be set, they
+		 * should set the realtime column to NULL, not blank. */
+		queue_set_param(q, tmp_name, v->value, -1, 0);
 	}
 
 	/* Temporarily set realtime members dead so we can detect deleted ones.