--- parser3/src/main/pa_sql_driver_manager.C	2015/04/02 22:18:26	1.93
+++ parser3/src/main/pa_sql_driver_manager.C	2016/07/29 20:24:17	1.95
@@ -1,7 +1,7 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -15,7 +15,7 @@
 #include "pa_vtable.h"
 #include "pa_charsets.h"
 
-volatile const char * IDENT_PA_SQL_DRIVER_MANAGER_C="$Id: pa_sql_driver_manager.C,v 1.93 2015/04/02 22:18:26 moko Exp $" IDENT_PA_SQL_DRIVER_MANAGER_H IDENT_PA_SQL_CONNECTION_H;
+volatile const char * IDENT_PA_SQL_DRIVER_MANAGER_C="$Id: pa_sql_driver_manager.C,v 1.95 2016/07/29 20:24:17 moko Exp $" IDENT_PA_SQL_DRIVER_MANAGER_H IDENT_PA_SQL_CONNECTION_H;
 
 // globals
 
@@ -65,18 +65,16 @@ void SQL_Driver_services_impl::transcode
 			charset_from_object=cache[0].object;
 		} else {
 			cache[0].name=charset_from_name;
-			cache[0].object=charset_from_object=&charsets.get(charset_from_name);
+			cache[0].object=charset_from_object=&charsets.get_direct(charset_from_name);
 		}
 		if(charset_to_name==cache[1].name) {
 			charset_to_object=cache[1].object;
 		} else {
 			cache[1].name=charset_to_name;
-			cache[1].object=charset_to_object=&charsets.get(charset_to_name);
+			cache[1].object=charset_to_object=&charsets.get_direct(charset_to_name);
 		}
 
-		String::C result=Charset::transcode(String::C(src, src_length), 
-			*charset_from_object,
-			*charset_to_object);
+		String::C result=Charset::transcode(String::C(src, src_length), *charset_from_object, *charset_to_object);
 		dst=result.str;
 		dst_length=result.length;
 	} catch(const Exception& e) {