From 24778dfc9bf67f431509361a173a33a1ab860b5d Mon Sep 17 00:00:00 2001 From: Frank Tang Date: Fri, 9 Jul 2021 00:40:23 +0000 Subject: [PATCH] ICU-21641 Fix "emoji" and "eor" for Collator::getKeywordValues See #1743 --- icu4c/source/common/uresbund.cpp | 2 +- icu4c/source/test/intltest/svccoll.cpp | 4 +++- .../com/ibm/icu/dev/test/collator/CollationServiceTest.java | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/icu4c/source/common/uresbund.cpp b/icu4c/source/common/uresbund.cpp index 5ea4187100e..3b8a654c3b6 100644 --- a/icu4c/source/common/uresbund.cpp +++ b/icu4c/source/common/uresbund.cpp @@ -2954,7 +2954,7 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status) UResourceBundle *bund = NULL; UResourceBundle *subPtr = NULL; UErrorCode subStatus = U_ZERO_ERROR; /* don't fail if a bundle is unopenable */ - bund = ures_openDirect(path, locale, &subStatus); + bund = ures_open(path, locale, &subStatus); #if defined(URES_TREE_DEBUG) if(!bund || U_FAILURE(subStatus)) { diff --git a/icu4c/source/test/intltest/svccoll.cpp b/icu4c/source/test/intltest/svccoll.cpp index 8d46c68f37f..a5f22b4d65b 100644 --- a/icu4c/source/test/intltest/svccoll.cpp +++ b/icu4c/source/test/intltest/svccoll.cpp @@ -560,7 +560,9 @@ static const int32_t KW_COUNT = UPRV_LENGTHOF(KW); static const char* KWVAL[] = { "phonebook", - "stroke" + "stroke", + "emoji", + "eor" }; static const int32_t KWVAL_COUNT = UPRV_LENGTHOF(KWVAL); diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java index c30812318eb..848499d1c29 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java @@ -341,7 +341,9 @@ public class CollationServiceTest extends TestFmwk { private static final String KWVAL[] = { "phonebook", - "stroke" + "stroke", + "emoji", + "eor", }; @Test -- 2.40.0