From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 7 Aug 2007 19:36:17 +0000 (+0000)
Subject: Merged revisions 78437 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1783
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72cc1dcfea226ec19c260494a07cc6d571af47e6;p=thirdparty%2Fasterisk.git

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

........
r78437 | tilghman | 2007-08-07 14:34:25 -0500 (Tue, 07 Aug 2007) | 2 lines

Don't free the environment handle when the connection fails, because other connections might be depending upon it

........


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

diff --git a/res/res_odbc.c b/res/res_odbc.c
index 56773f93b9..c46029f022 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -486,10 +486,7 @@ static odbc_status odbc_obj_connect(struct odbc_obj *obj)
 	res = SQLAllocHandle(SQL_HANDLE_DBC, obj->parent->env, &obj->con);
 
 	if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
-
 		ast_log(LOG_WARNING, "res_odbc: Error AllocHDB %d\n", res);
-		SQLFreeHandle(SQL_HANDLE_ENV, obj->parent->env);
-
 		ast_mutex_unlock(&obj->lock);
 		return ODBC_FAIL;
 	}