ICU-13461 Fixing coverity defects in new number parsing code.

X-SVN-Rev: 40834

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/DecimalMatcher.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/DecimalMatcher.java
index 4a12af11c2069faa78e7c38b6403ffba6825463c..7c5ab7994fe7982b6923f6162aca1d84b3af4336 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/DecimalMatcher.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/DecimalMatcher.java
@@ -304,6 +304,7 @@ public class DecimalMatcher implements NumberParseMatcher {
         }
 
         if (isScientific && segment.getOffset() != initialOffset) {
+            assert result.quantity != null; // scientific notation always comes after the number
             boolean overflow = (exponent == Integer.MAX_VALUE);
             if (!overflow) {
                 try {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
index 73654686dbb752aef2084bc258fec9400e8170b8..12b9a0535c74fb54d1dcf1a22cf57cc24e34d482 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
@@ -9,7 +9,6 @@ import java.util.Comparator;
 import java.util.List;
 
 import com.ibm.icu.impl.number.AffixPatternProvider;
-import com.ibm.icu.impl.number.AffixUtils;
 import com.ibm.icu.impl.number.CustomSymbolCurrency;
 import com.ibm.icu.impl.number.DecimalFormatProperties;
 import com.ibm.icu.impl.number.PatternStringParser;
@@ -225,11 +224,7 @@ public class NumberParserImpl {
         ///////////////////////////////
 
         if (!isStrict) {
-            if (!isStrict
-                    || patternInfo.containsSymbolType(AffixUtils.TYPE_PLUS_SIGN)
-                    || properties.getSignAlwaysShown()) {
-                parser.addMatcher(PlusSignMatcher.getInstance(symbols, false));
-            }
+            parser.addMatcher(PlusSignMatcher.getInstance(symbols, false));
             parser.addMatcher(MinusSignMatcher.getInstance(symbols, false));
             parser.addMatcher(NanMatcher.getInstance(symbols, parseFlags));
             parser.addMatcher(PercentMatcher.getInstance(symbols));