[asterisk-commits] tilghman: trunk r99776 - in /trunk: ./ res/res_odbc.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jan 22 22:25:33 2008
New Revision: 99776

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99776
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/res/res_odbc.c

Change Statistics:
 0 files changed

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

Modified: trunk/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_odbc.c?view=diff&rev=99776&r1=99775&r2=99776
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Tue Jan 22 22:25:33 2008
@@ -516,7 +516,7 @@
 
 	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;