[svn-commits] tilghman: trunk r298441 - in /trunk: ./ cdr/cdr_sqlite.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Dec 16 00:51:51 2010
New Revision: 298441

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

................
  r298394 | tilghman | 2010-12-15 18:30:04 -0600 (Wed, 15 Dec 2010) | 22 lines
  
  Merged revisions 298393 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r298393 | tilghman | 2010-12-15 18:29:10 -0600 (Wed, 15 Dec 2010) | 15 lines
    
    Merged revisions 298392 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r298392 | tilghman | 2010-12-15 18:28:04 -0600 (Wed, 15 Dec 2010) | 8 lines
      
      Unregister before shutting down the connection, to avoid a race.
      
      (closes issue #18481)
       Reported by: pabelanger
       Patches: 
             20101215__issue18481.diff.txt uploaded by tilghman (license 14)
       Tested by: pabelanger
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/cdr/cdr_sqlite.c

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

Modified: trunk/cdr/cdr_sqlite.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_sqlite.c?view=diff&rev=298441&r1=298440&r2=298441
==============================================================================
--- trunk/cdr/cdr_sqlite.c (original)
+++ trunk/cdr/cdr_sqlite.c Thu Dec 16 00:51:51 2010
@@ -188,9 +188,10 @@
 
 static int unload_module(void)
 {
-	if (db)
+	ast_cdr_unregister(name);
+	if (db) {
 		sqlite_close(db);
-	ast_cdr_unregister(name);
+	}
 	return 0;
 }