[asterisk-commits] qwell: trunk r61706 - in /trunk: ./ main/loader.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Fri Apr 20 16:16:14 2007
New Revision: 61706

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61706
Log:
Merged revisions 61705 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61705 | qwell | 2007-04-20 16:15:29 -0500 (Fri, 20 Apr 2007) | 12 lines

Merged revisions 61704 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61704 | qwell | 2007-04-20 16:14:27 -0500 (Fri, 20 Apr 2007) | 4 lines

Fix an issue that I noticed while looking over issue 9571.

The reload timestamp was getting set after reloading the built-in stuff, and before the modules.

........

................

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

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

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?view=diff&rev=61706&r1=61705&r2=61706
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Fri Apr 20 16:16:14 2007
@@ -529,6 +529,7 @@
 		ast_verbose("The previous reload command didn't finish yet\n");
 		return -1;	/* reload already in progress */
 	}
+	ast_lastreloadtime = time(NULL);
 
 	/* Call "predefined" reload here first */
 	for (i = 0; reload_classes[i].name; i++) {
@@ -537,7 +538,6 @@
 			res = 2;	/* found and reloaded */
 		}
 	}
-	ast_lastreloadtime = time(NULL);
 
 	if (name && res) {
 		ast_mutex_unlock(&reloadlock);