[svn-commits] tilghman: branch 1.8 r298394 - in /branches/1.8: ./ cdr/cdr_sqlite.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec 15 18:30:04 2010
New Revision: 298394

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298394
Log:
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:
    branches/1.8/   (props changed)
    branches/1.8/cdr/cdr_sqlite.c

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

Modified: branches/1.8/cdr/cdr_sqlite.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/cdr/cdr_sqlite.c?view=diff&rev=298394&r1=298393&r2=298394
==============================================================================
--- branches/1.8/cdr/cdr_sqlite.c (original)
+++ branches/1.8/cdr/cdr_sqlite.c Wed Dec 15 18:30:04 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;
 }