[svn-commits] file: trunk r431772 - in /trunk: ./ main/sorcery.c

[SVN commits to the Digium repositories]

Author: file
Date: Sat Feb 14 13:46:09 2015
New Revision: 431772

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431772
Log:
sorcery: Output an error message if a wizard is specified for an object type and it isn't found.

ASTERISK-24612 #close
Reported by: Joshua Colp
........

Merged revisions 431771 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/main/sorcery.c

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

Modified: trunk/main/sorcery.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/sorcery.c?view=diff&rev=431772&r1=431771&r2=431772
==============================================================================
--- trunk/main/sorcery.c (original)
+++ trunk/main/sorcery.c Sat Feb 14 13:46:09 2015
@@ -892,7 +892,11 @@
 	RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, ao2_alloc(sizeof(*object_wizard), sorcery_object_wizard_destructor), ao2_cleanup);
 	int created = 0;
 
-	if (!wizard || !object_wizard) {
+	if (!wizard) {
+		ast_log(LOG_ERROR, "Wizard '%s' could not be applied to object type '%s' as it was not found\n",
+			name, type);
+		return AST_SORCERY_APPLY_FAIL;
+	} else if (!object_wizard) {
 		return AST_SORCERY_APPLY_FAIL;
 	}