Merged revisions 99775 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99775 | tilghman | 2008-01-22 22:20:15 -0600 (Tue, 22 Jan 2008) | 2 lines

Oops, should have checked for a NULL obj, here, too

........

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

diff --git a/res/res_odbc.c b/res/res_odbc.c
index f97a198..201cf77 100644 (file)
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -516,7 +516,7 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
 
        if (obj && check) {
                ast_odbc_sanity_check(obj);
-       } else if (obj->parent->idlecheck > 0 && ast_tvdiff_ms(ast_tvnow(), obj->last_used) / 1000 > obj->parent->idlecheck)
+       } else if (obj && obj->parent->idlecheck > 0 && ast_tvdiff_sec(ast_tvnow(), obj->last_used) > obj->parent->idlecheck)
                odbc_obj_connect(obj);
 
        return obj;