diff options
| author |   Pavel Aharoni <pa0916@att.com> | 2017-05-11 19:32:07 +0300 |
|---|---|---|
| committer | Pavel Aharoni <pa0916@att.com> | 2017-05-11 19:32:07 +0300 |
| commit | 8caef088a9e5467cd0cb462acb217edceedac8fe (patch) | |
| tree | e47c41688833daf2ac76e53324992be1f15d2e56 /jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java | |
| parent | af2d8ef12f6b75ae837fffdeaf5d152756cec6d6 (diff) | |
[SDC-19] VFC to CP props
Change-Id: I217934251fd8eeaf883b60161826306d6b7eaf3c
Signed-off-by: Pavel Aharoni <pa0916@att.com>
Diffstat (limited to 'jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java')
| -rw-r--r-- | jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java index 1150e19..5b17b9a 100644 --- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java +++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/ScalarUnit.java @@ -86,9 +86,9 @@ public abstract class ScalarUnit { ValidateUtils.strToNum(matcher.group(1)); String scalarUnit = _checkUnitInScalarStandardUnits(matcher.group(2)); value = matcher.group(1) + " " + scalarUnit; - Object on1 = ValidateUtils.strToNum(matcher.group(1)); - Object on2 = SCALAR_UNIT_DICT.get(matcher.group(2)); - Object on3 = SCALAR_UNIT_DICT.get(unit); + Object on1 = ValidateUtils.strToNum(matcher.group(1)) != null ? ValidateUtils.strToNum(matcher.group(1)) : 0; + Object on2 = SCALAR_UNIT_DICT.get(matcher.group(2)) != null ? SCALAR_UNIT_DICT.get(matcher.group(2)) : 0; + Object on3 = SCALAR_UNIT_DICT.get(unit) != null ? SCALAR_UNIT_DICT.get(unit) : 0; Double n1 = new Double(on1.toString()); Double n2 = new Double(on2.toString()); |