[asterisk-commits] app voicemail: Fix incorrect msg leaving/retrieving an ODBC ... (asterisk[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri May 18 17:19:00 CDT 2018


Kevin Harwell has submitted this change and it was merged. ( https://gerrit.asterisk.org/9009 )

Change subject: app_voicemail: Fix incorrect msg leaving/retrieving an ODBC voicemail
......................................................................

app_voicemail: Fix incorrect msg leaving/retrieving an ODBC voicemail

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
---
M apps/app_voicemail.c
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved; Approved for Submit



diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index c3bfeb4..881da92 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3978,6 +3978,10 @@
 				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;

-- 
To view, visit https://gerrit.asterisk.org/9009
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic36e97d5eb070a23a12ba45972f6b53e2182a3f4
Gerrit-Change-Number: 9009
Gerrit-PatchSet: 1
Gerrit-Owner: Nic Colledge <nic at njcolledge.net>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20180518/4e1e3e82/attachment.html>


More information about the asterisk-commits mailing list