firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 09:20:39 +01:00
Code Issues

Fixed mistake

Browse Source
This commit is contained in:
Vlad Khorsun 2023-08-08 21:24:16 +03:00
parent 04bf24ae75
commit 4515398fa2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/unicode_util.cpp
View File

@ -1307,7 +1307,8 @@ public:
const int favMin = 1; const int favMin = 1;
try try
{ {
return Jrd::ImplementConversionICU::create(favMaj, favMin); if ((convIcu = Jrd::ImplementConversionICU::create(favMaj, favMin)))
return convIcu;
} }
catch (const Exception&) catch (const Exception&)
{ } { }
@ -1315,7 +1316,8 @@ public:
// Try system-wide version // Try system-wide version
try try
{ {
return Jrd::ImplementConversionICU::create(0, 0); if ((convIcu = Jrd::ImplementConversionICU::create(0, 0)))
return convIcu;
} }
catch (const Exception&) catch (const Exception&)
{ } { }
@ -1354,7 +1356,8 @@ public:
try try
{ {
return Jrd::ImplementConversionICU::create(major, minor); if ((convIcu = Jrd::ImplementConversionICU::create(major, minor)))
return convIcu;
} }
catch (const Exception& ex) catch (const Exception& ex)
{ {
@ -1390,11 +1393,11 @@ public:
} }
}; };
static InitInstance<ImplementConversionICU, ConvICUAllocator> convIcu; static InitInstance<ImplementConversionICU, ConvICUAllocator> convIcuInstance;
UnicodeUtil::ConversionICU& UnicodeUtil::getConversionICU() UnicodeUtil::ConversionICU& UnicodeUtil::getConversionICU()
{ {
return convIcu(); return convIcuInstance();
} }