ICU-8942 straggler fixes, parallel with C++

X-SVN-Rev: 30995

diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationParsedRuleBuilder.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationParsedRuleBuilder.java
index b654526e2e20a5bc25e1ddaad62a17262095397f..94f1e8c277c95466ffe3d762f5ed4bb23f01b01b 100644 (file)
--- a/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationParsedRuleBuilder.java
+++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/CollationParsedRuleBuilder.java
@@ -3815,7 +3815,7 @@ final class CollationParsedRuleBuilder {
                     int supp = Character.toCodePoint(c, (char)0xdc00);
                     int suppLimit = supp + 0x400;
                     while (supp < suppLimit) {
-                        fcd |= m_nfcImpl_.getFCD16(supp++);
+                        fcd |= m_nfcImpl_.getFCD16FromNormData(supp++);
                     }
                 }
             } else {
@@ -3826,7 +3826,7 @@ final class CollationParsedRuleBuilder {
                     (UTF16.isLeadSurrogate(c) && fcd != 0)) {
                 // c is a leading surrogate with some FCD data
                 unsafeCPSet(t.m_unsafeCP_, c);
-                if (buildCMTable && (fcd != 0)) {
+                if (buildCMTable) {
                     int cc = (fcd & 0xff);
                     int pos = (cc << 8) + index[cc];
                     cm[pos] = c;