[asterisk-commits] twilson: trunk r340224 - in /trunk: UPGRADE.txt main/db.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Oct 10 18:10:11 2011
New Revision: 340224

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=340224
Log:
Return error when no rows are deleted for AMI DBDelTree

(closes issue AST-654)

Modified:
    trunk/UPGRADE.txt
    trunk/main/db.c

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=340224&r1=340223&r2=340224
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Mon Oct 10 18:10:11 2011
@@ -35,6 +35,10 @@
    - cdr.conf: [general] and [csv] sections
    - dnsmgr.conf
    - dsp.conf
+
+AMI:
+  - DBDelTree now correctly returns an error when 0 rows are deleted just as
+    the DBDel action does.
 
 SIP
 ===

Modified: trunk/main/db.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/db.c?view=diff&rev=340224&r1=340223&r2=340224
==============================================================================
--- trunk/main/db.c (original)
+++ trunk/main/db.c Mon Oct 10 18:10:11 2011
@@ -840,7 +840,7 @@
 	else
 		res = ast_db_deltree(family, NULL);
 
-	if (res < 0)
+	if (res <= 0)
 		astman_send_error(s, m, "Database entry not found");
 	else
 		astman_send_ack(s, m, "Key tree deleted successfully");