[svn-commits] dbailey: tag autotag_for_aadk-0.3.3 r58851 - /tags/autotag_for_aadk-0.3.3/main/

[svn-commits at lists.digium.com]

Author: dbailey
Date: Tue Mar 13 09:00:01 2007
New Revision: 58851

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58851
Log:
Commit patch for this AADK test version

Modified:
    tags/autotag_for_aadk-0.3.3/main/loader.c
    tags/autotag_for_aadk-0.3.3/main/manager.c

Modified: tags/autotag_for_aadk-0.3.3/main/loader.c
URL: http://svn.digium.com/view/asterisk/tags/autotag_for_aadk-0.3.3/main/loader.c?view=diff&rev=58851&r1=58850&r2=58851
==============================================================================
--- tags/autotag_for_aadk-0.3.3/main/loader.c (original)
+++ tags/autotag_for_aadk-0.3.3/main/loader.c Tue Mar 13 09:00:01 2007
@@ -531,6 +531,12 @@
 		return -1;	/* reload already in progress */
 	}
 
+	if (ast_lastreloadtime && time(NULL) - ast_lastreloadtime < 5) {
+		ast_verbose("The previous reload was less than 5 seconds ago.\n");
+		ast_mutex_unlock(&reloadlock);
+		return -1;
+	}
+
 	/* Call "predefined" reload here first */
 	for (i = 0; reload_classes[i].name; i++) {
 		if (!name || !strcasecmp(name, reload_classes[i].name)) {

Modified: tags/autotag_for_aadk-0.3.3/main/manager.c
URL: http://svn.digium.com/view/asterisk/tags/autotag_for_aadk-0.3.3/main/manager.c?view=diff&rev=58851&r1=58850&r2=58851
==============================================================================
--- tags/autotag_for_aadk-0.3.3/main/manager.c (original)
+++ tags/autotag_for_aadk-0.3.3/main/manager.c Tue Mar 13 09:00:01 2007
@@ -1040,7 +1040,7 @@
 		astman_send_error(s, m, "Filename not specified");
 		return 0;
 	}
-	if (!(cfg = ast_config_load_with_comments(fn))) {
+	if (!(cfg = ast_config_load(fn))) {
 		astman_send_error(s, m, "Config file not found");
 		return 0;
 	}
@@ -1144,7 +1144,7 @@
 		astman_send_error(s, m, "Filename not specified");
 		return 0;
 	}
-	if (!(cfg = ast_config_load_with_comments(sfn))) {
+	if (!(cfg = ast_config_load(sfn))) {
 		astman_send_error(s, m, "Config file not found");
 		return 0;
 	}