diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-23 04:25:33 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-23 04:25:33 +0000 |
| commit | e813ac00529ca92c783def50d616724ef96d8863 (patch) | |
| tree | f3efd561817cc5972fefa6a2fa9f122cb61ed95a | |
| parent | c6d9da500329cbfa0b3f9603696f0b9a15a599e9 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@99776 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | res/res_odbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c index f97a19863..201cf77b9 100644 --- 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; |