--- parser3/src/main/pa_sql_driver_manager.C 2001/05/17 18:36:33 1.18 +++ parser3/src/main/pa_sql_driver_manager.C 2001/06/28 07:44:17 1.22 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_sql_driver_manager.C,v 1.18 2001/05/17 18:36:33 parser Exp $ */ +static const char *RCSId="$Id: pa_sql_driver_manager.C,v 1.22 2001/06/28 07:44:17 parser Exp $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" @@ -55,7 +54,6 @@ private: /// @param request_url protocol://[driver-dependent] SQL_Connection& SQL_Driver_manager::get_connection(const String& request_url, Table *protocol2driver_and_client) { -////__asm int 3; Pool& pool=request_url.pool(); // request pool // we have table for locating protocol's library @@ -203,6 +201,8 @@ void SQL_Driver_manager::put_driver_to_c SQL_Connection *SQL_Driver_manager::get_connection_from_cache(const String& url) { SYNCHRONIZED; + maybe_expire_connection_cache(); + if(Stack *connections=static_cast(connection_cache.get(url))) while(connections->top_index()>=0) { // there are cached connections to that 'url' SQL_Connection *result=static_cast(connections->pop()); @@ -217,8 +217,6 @@ void SQL_Driver_manager::put_connection_ SQL_Connection& connection) { SYNCHRONIZED; - maybe_expire_connection_cache(); - Stack *connections=static_cast(connection_cache.get(url)); if(!connections) { // there are no cached connections to that 'url' yet? connections=NEW Stack(pool()); // NOTE: never freed up!