From 6f5c6818433bf3624543e906874e02c69569f4d1 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 5 Jan 2011 18:57:05 +0000
Subject: [PATCH] Merged revisions 300623 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300623 | tilghman | 2011-01-05 12:56:12 -0600 (Wed, 05 Jan 2011) | 24 lines

  Merged revisions 300622 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r300622 | tilghman | 2011-01-05 12:54:58 -0600 (Wed, 05 Jan 2011) | 17 lines

    Merged revisions 300621 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r300621 | tilghman | 2011-01-05 12:47:46 -0600 (Wed, 05 Jan 2011) | 10 lines

      Use the sanity check in place of the disconnect/connect cycle.

      The disconnect/connect cycle has the potential to cause random crashes.

      (closes issue #18243)
       Reported by: ks3
       Patches:
             res_odbc.patch uploaded by ks3 (license 1147)
       Tested by: ks3
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 res/res_odbc.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/res/res_odbc.c b/res/res_odbc.c
index 6e179efff7..67ba3111db 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -596,12 +596,11 @@ SQLHSTMT ast_odbc_direct_execute(struct odbc_obj *obj, SQLHSTMT (*exec_cb)(struc
 		} else if (obj->tx) {
 			ast_log(LOG_WARNING, "Failed to execute, but unable to reconnect, as we're transactional.\n");
 			break;
-		} else {
-			obj->up = 0;
-			ast_log(LOG_WARNING, "SQL Exec Direct failed.  Attempting a reconnect...\n");
-
-			odbc_obj_disconnect(obj);
-			odbc_obj_connect(obj);
+		} else if (attempt == 0) {
+			ast_log(LOG_WARNING, "SQL Execute error! Verifying connection to %s [%s]...\n", obj->parent->name, obj->parent->dsn);
+		}
+		if (!ast_odbc_sanity_check(obj)) {
+			break;
 		}
 	}
 
@@ -643,7 +642,7 @@ SQLHSTMT ast_odbc_prepare_and_execute(struct odbc_obj *obj, SQLHSTMT (*prepare_c
 					ast_log(LOG_WARNING, "SQL Execute error, but unable to reconnect, as we're transactional.\n");
 					break;
 				} else {
-					ast_log(LOG_WARNING, "SQL Execute error %d! Attempting a reconnect...\n", res);
+					ast_log(LOG_WARNING, "SQL Execute error %d! Verifying connection to %s [%s]...\n", res, obj->parent->name, obj->parent->dsn);
 					SQLFreeHandle(SQL_HANDLE_STMT, stmt);
 					stmt = NULL;
 
@@ -652,7 +651,9 @@ SQLHSTMT ast_odbc_prepare_and_execute(struct odbc_obj *obj, SQLHSTMT (*prepare_c
 					 * While this isn't the best way to try to correct an error, this won't automatically
 					 * fail when the statement handle invalidates.
 					 */
-					ast_odbc_sanity_check(obj);
+					if (!ast_odbc_sanity_check(obj)) {
+						break;
+					}
 					continue;
 				}
 			} else {