From: Kinsey Moore <kmoore@digium.com>
Date: Wed, 10 Aug 2011 13:48:41 +0000 (+0000)
Subject: Merged revisions 331315 via svnmerge from
X-Git-Tag: 10.0.0-beta2~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43d5f5ba3ad586ec0ed686578ccc9c572d54aaa0;p=thirdparty%2Fasterisk.git

Merged revisions 331315 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r331315 | kmoore | 2011-08-10 08:47:46 -0500 (Wed, 10 Aug 2011) | 8 lines

  AMI action ModuleReload returns Error if Module: missing or empty

  An empty string was not being checked for properly causing identification of
  the module to be reloaded to fail and return an Error with message
  "No such module."

  (closes issue AST-616)
........


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

diff --git a/main/manager.c b/main/manager.c
index 94782418ca..319b5ba86f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -4586,7 +4586,7 @@ static int manager_moduleload(struct mansession *s, const struct message *m)
 			astman_send_ack(s, m, "Module unloaded.");
 		}
 	} else if (!strcasecmp(loadtype, "reload")) {
-		if (module != NULL) {
+		if (!ast_strlen_zero(module)) {
 			res = ast_module_reload(module);
 			if (res == 0) {
 				astman_send_error(s, m, "No such module.");