[asterisk-commits] kharwell: branch 11 r404858 - in /branches/11: ./ cel/cel_pgsql.c

[SVN commits to the Asterisk project]

Author: kharwell
Date: Fri Jan  3 15:58:17 2014
New Revision: 404858

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404858
Log:
cel_pgsql: module not correctly reloading

Upon reload the module unconditionally "unloaded" the module (freeing memory
and setting pointers to NULL) and then when attempting a "load" if the config
file had not changed then nothing would be reinitialized.

By moving the "unload" to occur conditionally (reload only) after an attempted
configuration load, but before module "loading" alleviates the issue. The module
now loads/unloads/reloads correctly.

(closes issue ASTERISK-22871)
Reported by: Matteo
........

Merged revisions 404857 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/11/   (props changed)
    branches/11/cel/cel_pgsql.c

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

Modified: branches/11/cel/cel_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/cel/cel_pgsql.c?view=diff&rev=404858&r1=404857&r2=404858
==============================================================================
--- branches/11/cel/cel_pgsql.c (original)
+++ branches/11/cel/cel_pgsql.c Fri Jan  3 15:58:17 2014
@@ -559,6 +559,10 @@
 		return AST_MODULE_LOAD_SUCCESS;
 	}
 
+	if (reload) {
+		my_unload_module();
+	}
+
 	process_my_load_module(cfg);
 	ast_config_destroy(cfg);
 
@@ -579,7 +583,6 @@
 
 static int reload(void)
 {
-	my_unload_module();
 	return my_load_module(1);
 }