[asterisk-commits] mmichelson: branch 11 r374106 - /branches/11/apps/confbridge/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Oct  1 11:12:43 2012
New Revision: 374106

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374106
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


Modified:
    branches/11/apps/confbridge/conf_config_parser.c

Modified: branches/11/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/confbridge/conf_config_parser.c?view=diff&rev=374106&r1=374105&r2=374106
==============================================================================
--- branches/11/apps/confbridge/conf_config_parser.c (original)
+++ branches/11/apps/confbridge/conf_config_parser.c Mon Oct  1 11:12:43 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;
 }