[asterisk-commits] mmichelson: trunk r374107 - in /trunk: ./ apps/confbridge/conf_config_parser.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Oct  1 11:26:23 2012
New Revision: 374107

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374107
Log:
Don't destroy confbridge config when error is encountered during a reload.

Not panicking means that the old config is kept.

(closes issue ASTERISK-20458)
Reported by: Leif Madsen
Patches:
	ASTERISK-20458.patch uploaded by Mark Michelson(license #5049)
Tested by Leif Madsen
........

Merged revisions 374106 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/apps/confbridge/conf_config_parser.c

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

Modified: trunk/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/confbridge/conf_config_parser.c?view=diff&rev=374107&r1=374106&r2=374107
==============================================================================
--- trunk/apps/confbridge/conf_config_parser.c (original)
+++ trunk/apps/confbridge/conf_config_parser.c Mon Oct  1 11:26:23 2012
@@ -1316,7 +1316,10 @@
 
 	return 0;
 error:
-	conf_destroy_config();
+	/* On a reload, just keep the config we already have in place. */
+	if (!reload) {
+		conf_destroy_config();
+	}
 	return -1;
 }