[svn-commits] dvossel: trunk r316216 - in /trunk: ./ res/res_odbc.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue May  3 13:51:41 2011
New Revision: 316216

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316216
Log:
Merged revisions 316215 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316215 | dvossel | 2011-05-03 13:49:48 -0500 (Tue, 03 May 2011) | 9 lines
  
  Fixes a random crash (NULL reference) in res_odbc.c.
  
  (closes issue #19180)
  Reported by: pruiz
  Patches: 
        tmp.diff uploaded by pruiz (license 1152)
  Tested by: pruiz, seanbright
........

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

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

Modified: trunk/res/res_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_odbc.c?view=diff&rev=316216&r1=316215&r2=316216
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Tue May  3 13:51:41 2011
@@ -1360,7 +1360,7 @@
 
 	if (obj && ast_test_flag(&flags, RES_ODBC_CONNECTED) && !obj->up) {
 		/* Check if this connection qualifies for reconnection, with negative connection cache time */
-		if (time(NULL) > class->last_negative_connect.tv_sec + class->negative_connection_cache.tv_sec) {
+		if (time(NULL) > obj->parent->last_negative_connect.tv_sec + obj->parent->negative_connection_cache.tv_sec) {
 			odbc_obj_connect(obj);
 		}
 	} else if (obj && ast_test_flag(&flags, RES_ODBC_SANITY_CHECK)) {