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)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@287387 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index a221e9f554cda6a58765d7f60d1b3898014e261a..56118fd8c144c9d1cb87f4e1bce0cc44fec98ca9 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1792,10 +1792,10 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as
                } 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.