ICU-4707 Properly fix the last fix.

X-SVN-Rev: 19406
This commit is contained in:
George Rhoten 2006-03-22 09:38:06 +00:00
parent 0a59fb064b
commit fda1f467e9

View file

@ -1549,6 +1549,7 @@ _canonicalize(const char* localeID,
UErrorCode* err) {
int32_t j, len, fieldCount=0, scriptSize=0, variantSize=0, nameCapacity;
char localeBuffer[ULOC_FULLNAME_CAPACITY];
const char* origLocaleID = localeID;
const char* keywordAssign = NULL;
const char* separatorIndicator = NULL;
const char* addKeyword = NULL;
@ -1579,7 +1580,7 @@ _canonicalize(const char* localeID,
/* get all pieces, one after another, and separate with '_' */
len=_getLanguage(localeID, name, nameCapacity, &localeID);
if(len == I_DEFAULT_LENGTH && uprv_strncmp(localeID, i_default, len) == 0) {
if(len == I_DEFAULT_LENGTH && uprv_strncmp(origLocaleID, i_default, len) == 0) {
const char *d = uloc_getDefault();
len = uprv_strlen(d);