[asterisk-commits] jpeeler: branch 1.6.0 r114867 - in /branches/1.6.0: ./ channels/iax2-provision.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Apr 29 17:55:13 2008
New Revision: 114867

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114867
Log:
Merged revisions 114866 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r114866 | jpeeler | 2008-04-29 17:54:14 -0500 (Tue, 29 Apr 2008) | 2 lines

Fixes a problem where all the templates were marked as dead no matter what. The templates should only be marked as dead if a configuration file has been successfully loaded and has changes. Bug found while making API documentation for 1.6.0.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/iax2-provision.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/iax2-provision.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/iax2-provision.c?view=diff&rev=114867&r1=114866&r2=114867
==============================================================================
--- branches/1.6.0/channels/iax2-provision.c (original)
+++ branches/1.6.0/channels/iax2-provision.c Tue Apr 29 17:55:13 2008
@@ -491,14 +491,16 @@
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 	if (!provinit)
 		iax_provision_init();
-	/* Mark all as dead.  No need for locking */
-	cur = templates;
-	while(cur) {
-		cur->dead = 1;
-		cur = cur->next;
-	}
+	
 	cfg = ast_config_load("iaxprov.conf", config_flags);
 	if (cfg != NULL && cfg != CONFIG_STATUS_FILEUNCHANGED) {
+		/* Mark all as dead.  No need for locking */
+		cur = templates;
+		while(cur) {
+			cur->dead = 1;
+			cur = cur->next;
+		}
+
 		/* Load as appropriate */
 		cat = ast_category_browse(cfg, NULL);
 		while(cat) {