[svn-commits] tilghman: trunk r78442 - in /trunk: ./ res/res_odbc.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Aug  7 14:36:17 2007
New Revision: 78442

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

........

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

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=78442&r1=78441&r2=78442
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Tue Aug  7 14:36:17 2007
@@ -486,10 +486,7 @@
 	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;
 	}