diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-10-01 16:26:23 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-10-01 16:26:23 +0000 |
| commit | d819508baee3e29b8738a81dc1a669953f8d6a1f (patch) | |
| tree | 4ee32eba93fd377db27c1faf4ee8fbf1a6cec1fa /apps/confbridge/conf_config_parser.c | |
| parent | 0fc114dc656087cd095da88a6572841a41ced193 (diff) | |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/confbridge/conf_config_parser.c')
| -rw-r--r-- | apps/confbridge/conf_config_parser.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c index f4a960410..128691458 100644 --- a/apps/confbridge/conf_config_parser.c +++ b/apps/confbridge/conf_config_parser.c @@ -1316,7 +1316,10 @@ int conf_load_config(int reload) 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; } |