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

ICU-4146 Try to make the date time construction more robust.

Browse Source 
X-SVN-Rev: 17974
This commit is contained in:
George Rhoten 2005-06-22 04:40:32 +00:00
parent 3d9607f698
commit d7d0178b8d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4c/source/i18n/smpdtfmt.cpp
View File

@ -287,6 +287,7 @@ void SimpleDateFormat::construct(EStyle timeStyle,
// We will need the calendar to know what type of symbols to load.
initializeCalendar(NULL, locale, status);
if (U_FAILURE(status)) return;
CalendarData calData(locale, fCalendar?fCalendar->getType():NULL, status);
UResourceBundle *dateTimePatterns = calData.getByKey(gDateTimePatternsTag, status);
@ -357,10 +358,13 @@ void SimpleDateFormat::construct(EStyle timeStyle,
Calendar*
SimpleDateFormat::initializeCalendar(TimeZone* adoptZone, const Locale& locale, UErrorCode& status)
{
if(!U_FAILURE(status)) {
fCalendar = Calendar::createInstance(adoptZone?adoptZone:TimeZone::createDefault(), locale, status);
}
return fCalendar;
if(!U_FAILURE(status)) {
fCalendar = Calendar::createInstance(adoptZone?adoptZone:TimeZone::createDefault(), locale, status);
}
if (U_SUCCESS(status) && fCalendar == NULL) {
status = U_MEMORY_ALLOCATION_ERROR;
}
return fCalendar;
}
void