diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java index f2e6d11afc8..6c8dc49dde9 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java @@ -994,7 +994,7 @@ public abstract class Collator implements Comparator, Freezable e = irb.getKeys(); while (e.hasMoreElements()) { String s = e.nextElement(); - if (!DEFAULT_TAG.equals(s)) { - // don't add 'default' items + if (!DEFAULT_TAG.equals(s) && !s.startsWith("private-")) { + // don't add 'default' items, nor unlisted types keywords.add(s); } } diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 6aaef2103cb..3dfc24b5c57 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba61a15f14acdc6a323524db85c2e5990dc15b20c04fcb170bbb9a5517864099 -size 10503185 +oid sha256:df42e127c7c6127bce3a0a44577d33d8457fc073f5fa131f6916c039b374932c +size 10503267 diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java index b30ebbd67d1..ad4c70406d2 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java @@ -2194,7 +2194,12 @@ public class CollationMiscTest extends TestFmwk { log(values[i]+", "); } logln(""); - logln("Number of collator values returned : " + values.length); + logln("Number of collation keyword values returned : " + values.length); + for(int i=0; i