[asterisk-commits] bbryant: trunk r305604 - in /trunk: ./ cel/cel_pgsql.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Tue Feb  1 13:27:23 2011
New Revision: 305604

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305604
Log:
Merged revisions 305603 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r305603 | bbryant | 2011-02-01 14:23:20 -0500 (Tue, 01 Feb 2011) | 4 lines
  
  Add a possible solution to a customer problem with reloading cel_pgsql.so
  quickly.
........

Modified:
    trunk/   (props changed)
    trunk/cel/cel_pgsql.c

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

Modified: trunk/cel/cel_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_pgsql.c?view=diff&rev=305604&r1=305603&r2=305604
==============================================================================
--- trunk/cel/cel_pgsql.c (original)
+++ trunk/cel/cel_pgsql.c Tue Feb  1 13:27:23 2011
@@ -337,31 +337,39 @@
 static int my_unload_module(void)
 {
 	struct columns *current;
+	AST_RWLIST_WRLOCK(&psql_columns);
 	if (event_sub) {
 		event_sub = ast_event_unsubscribe(event_sub);
+		event_sub = NULL;
 	}
 	if (conn) {
 		PQfinish(conn);
+		conn = NULL;
 	}
 	if (pghostname) {
 		ast_free(pghostname);
+		pghostname = NULL;
 	}
 	if (pgdbname) {
 		ast_free(pgdbname);
+		pgdbname = NULL;
 	}
 	if (pgdbuser) {
 		ast_free(pgdbuser);
+		pgdbuser = NULL;
 	}
 	if (pgpassword) {
 		ast_free(pgpassword);
+		pgpassword = NULL;
 	}
 	if (pgdbport) {
 		ast_free(pgdbport);
+		pgdbport = NULL;
 	}
 	if (table) {
 		ast_free(table);
-	}
-	AST_RWLIST_WRLOCK(&psql_columns);
+		table = NULL;
+	}
 	while ((current = AST_RWLIST_REMOVE_HEAD(&psql_columns, list))) {
 		ast_free(current);
 	}