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

Better logging when some problem happened detecting the OS time zone.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2018-12-27 18:48:21 -02:00
parent 3c6115a08c
commit 86081d3264
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/TimeZoneUtil.cpp
View File

@ -220,11 +220,13 @@ USHORT TimeZoneUtil::getSystemTimeZone()
readGuard.release();
WriteLockGuard writeGuard(lock, "TimeZoneUtil::getSystemTimeZone");
string bufferStrAscii;
if (!U_FAILURE(icuErrorCode))
{
bool error;
string bufferStrUnicode(reinterpret_cast<const char*>(buffer), len * sizeof(USHORT));
string bufferStrAscii(IntlUtil::convertUtf16ToAscii(bufferStrUnicode, &error));
bufferStrAscii = IntlUtil::convertUtf16ToAscii(bufferStrUnicode, &error);
USHORT id;
if (timeZoneStartup().getId(bufferStrAscii, id))
@ -237,7 +239,8 @@ USHORT TimeZoneUtil::getSystemTimeZone()
else
icuErrorCode = U_ZERO_ERROR;
gds__log("ICU error retrieving the system time zone: %d. Fallbacking to displacement.", int(icuErrorCode));
gds__log("ICU error (%d) retrieving the system time zone (%s). Falling back to displacement.",
int(icuErrorCode), bufferStrAscii.c_str());
UCalendar* icuCalendar = icuLib.ucalOpen(NULL, -1, NULL, UCAL_GREGORIAN, &icuErrorCode);