AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5086 Only use a non-Olson ID when the raw offset is wrong. This

Browse Source 
allows the daylight saving changeover to happen in long running ICU processes.

X-SVN-Rev: 19327
This commit is contained in:
George Rhoten 2006-03-03 20:10:02 +00:00
parent 06743ea5a6
commit 5ec2f7ff26
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
icu4c/source/i18n/timezone.cpp
View File

@ -525,15 +525,16 @@ TimeZone::initDefault()
UnicodeString hostStrID(hostID, -1, US_INV);
hostStrID.append((UChar)0);
hostStrID.truncate(hostStrID.length()-1);
default_zone = createSystemTimeZone(hostStrID);
int32_t hostIDLen = hostStrID.length();
if ((hostIDLen < 3 || 4 < hostIDLen)
|| (hostStrID[hostIDLen-2] != 'S'
&& hostStrID[hostIDLen-2] != 'D'
&& hostStrID[hostIDLen-1] != 'T'))
if (default_zone != NULL && rawOffset != default_zone->getRawOffset()
&& (3 <= hostIDLen && hostIDLen <= 4))
{
/* If this doesn't look like a non-unique abbreviation,
try to create an Olson ID from it. */
default_zone = createSystemTimeZone(hostStrID);
// Uh oh. This probably wasn't a good id.
// It was probably an ambiguous abbreviation
delete default_zone;
default_zone = NULL;
}
#if 0