[svn-commits] kmoore: trunk r331317 - in /trunk: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Wed Aug 10 08:49:31 2011
New Revision: 331317

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331317
Log:
Merged revisions 331316 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331316 | kmoore | 2011-08-10 08:48:41 -0500 (Wed, 10 Aug 2011) | 15 lines
  
  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:
    trunk/   (props changed)
    trunk/main/manager.c

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

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=331317&r1=331316&r2=331317
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Aug 10 08:49:31 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.");