[svn-commits] kmoore: branch 10 r331316 - in /branches/10: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Wed Aug 10 08:48:41 2011
New Revision: 331316

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331316
Log:
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)
........

Modified:
    branches/10/   (props changed)
    branches/10/main/manager.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/manager.c?view=diff&rev=331316&r1=331315&r2=331316
==============================================================================
--- branches/10/main/manager.c (original)
+++ branches/10/main/manager.c Wed Aug 10 08:48:41 2011
@@ -4586,7 +4586,7 @@
 			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.");