From 116ca42f28a4e669bc4d209422efa7f80dad8eda Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Wed, 6 Jul 2011 21:05:45 +0000 Subject: [PATCH] ICU-8639 Merging #8637 Java assertion error in PluralFormat (r30259) to maint-4-8 X-SVN-Rev: 30288 --- main/classes/core/src/com/ibm/icu/text/PluralFormat.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/classes/core/src/com/ibm/icu/text/PluralFormat.java b/main/classes/core/src/com/ibm/icu/text/PluralFormat.java index f25eff9ed8c..5efd38f5a41 100644 --- a/main/classes/core/src/com/ibm/icu/text/PluralFormat.java +++ b/main/classes/core/src/com/ibm/icu/text/PluralFormat.java @@ -422,10 +422,10 @@ public class PluralFormat extends UFormat { // We have already seen an "other" sub-message. // Do not match "other" again. haveKeywordMatch=true; - continue; + // Skip keyword matching but do getLimitPartIndex(). } } - if(pattern.partSubstringMatches(part, keyword)) { + if(!haveKeywordMatch && pattern.partSubstringMatches(part, keyword)) { // keyword matches msgStart=partIndex; // Do not match this keyword again. -- 2.49.0