commit 8da6ef17765ec98742186ad8a6b8379cfb74dd81
author Shane Carr <shane@unicode.org> Thu Mar 08 00:20:31 2018 +0000
committer Shane Carr <shane@unicode.org> Thu Mar 08 00:20:31 2018 +0000
tree d9cec53d8a5088c6db691af1802e957dd262ba4f
parent 4a5c8afa5b0a09a60818b42cdf075095566090ac

ICU-13574 Revising codePointZero loading based on feedback.

X-SVN-Rev: 41082

icu4c/source/i18n/dcfmtsym.cpp

diff --git a/icu4c/source/i18n/dcfmtsym.cpp b/icu4c/source/i18n/dcfmtsym.cpp
index 02c0e07..a2cc58c 100644
--- a/icu4c/source/i18n/dcfmtsym.cpp
+++ b/icu4c/source/i18n/dcfmtsym.cpp
@@ -437,15 +437,19 @@
     sink.resolveMissingMonetarySeparators(fSymbols);
 
     // Resolve codePointZero
-    const UnicodeString& stringZero = getConstDigitSymbol(0);
-    UChar32 tempCodePointZero = stringZero.char32At(0);
-    if (u_isdigit(tempCodePointZero) && stringZero.countChar32() == 1) {
-        for (int32_t i=0; i<=9; i++) {
-            const UnicodeString& stringDigit = getConstDigitSymbol(i);
-            if (stringDigit.char32At(0) != tempCodePointZero + i || stringDigit.countChar32() != 1) {
-                tempCodePointZero = -1;
-                break;
-            }
+    UChar32 tempCodePointZero;
+    for (int32_t i=0; i<=9; i++) {
+        const UnicodeString& stringDigit = getConstDigitSymbol(i);
+        if (stringDigit.countChar32() != 1) {
+            tempCodePointZero = -1;
+            break;
+        }
+        UChar32 cp = stringDigit.char32At(0);
+        if (i == 0) {
+            tempCodePointZero = cp;
+        } else if (cp != tempCodePointZero + i) {
+            tempCodePointZero = -1;
+            break;
         }
     }
     fCodePointZero = tempCodePointZero;