]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
app_voicemail: Fix incorrect msg leaving/retrieving an ODBC voicemail
authorNic Colledge <nic@njcolledge.net>
Sat, 12 May 2018 11:53:13 +0000 (12:53 +0100)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 17 May 2018 21:55:18 +0000 (15:55 -0600)
Correct the log warning message shown when ODBC voicemail
retrieve_file is called and there is a null value in the category
column.
A more meaningfull message is now written at debug level.

ASTERISK-27853

Change-Id: Ic36e97d5eb070a23a12ba45972f6b53e2182a3f4

apps/app_voicemail.c

index 86f2873a5c21405fd1c4769fe8b6e14825387f6f..9f52b082be0ab8a18f4a7b67b1d150874cdfa5bb 100644 (file)
@@ -3961,6 +3961,10 @@ static int retrieve_file(char *dir, int msgnum)
                                generate_msg_id(msg_id);
                                snprintf(rowdata, sizeof(rowdata), "%s", msg_id);
                                odbc_update_msg_id(dir, msgnum, msg_id);
+                       } else if (res == SQL_NULL_DATA && !strcasecmp(coltitle, "category")) {
+                               /* Ignore null column value for category */
+                               ast_debug(3, "Ignoring null category column in ODBC voicemail retrieve_file.\n");
+                               continue;
                        } else if (!SQL_SUCCEEDED(res)) {
                                ast_log(AST_LOG_WARNING, "SQL Get Data error! coltitle=%s\n[%s]\n\n", coltitle, sql);
                                goto bail_with_handle;