organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 04:29:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-11388 fix bug in CollationFastLatinBuilder

Browse source 
X-SVN-Rev: 36781
This commit is contained in:
Markus Scherer 2014-11-30 19:55:58 +00:00
parent 056f2f768c
commit f037dbecdd
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationFastLatinBuilder.java
View file

@ -590,7 +590,7 @@ final class CollationFastLatinBuilder {
int miniCE = encodeTwoCEs(cce0, cce1);
if(miniCE == CollationFastLatin.BAIL_OUT) {
result.append((char)(x | (1 << CollationFastLatin.CONTR_LENGTH_SHIFT)));
} else if(miniCE <= 0xffff) {
} else if((miniCE >>> 16) == 0) { // if ((unsigned)miniCE <= 0xffff)
result.append((char)(x | (2 << CollationFastLatin.CONTR_LENGTH_SHIFT)));
result.append((char)miniCE);
} else {

12
icu4j/main/tests/collate/src/com/ibm/icu/dev/data/collationtest.txt
View file

@ -2464,3 +2464,15 @@
<1 4
<1 L
<1 Ω
** test: regression test for CollationFastLatinBuilder, ICU ticket 11388
@ rules
&x<<aa<<<Aa<<<AA
% strength=secondary
* compare
<1 AA
<2 Aẩ
<2 aą
* compare
<1 AA
<2 aą