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
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@298394 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index a46902c9cba90ac90ab3cedf35b96c64d26ecbae..e21d3365971aeac86e8ed1dbc437d57181728a5a 100644 (file)
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -188,9 +188,10 @@ static int sqlite_log(struct ast_cdr *cdr)
 
 static int unload_module(void)
 {
-       if (db)
-               sqlite_close(db);
        ast_cdr_unregister(name);
+       if (db) {
+               sqlite_close(db);
+       }
        return 0;
 }