From 0bd35804c85479c49f306afbadae2ab60d53ee95 Mon Sep 17 00:00:00 2001 From: David Yonge-Mallo Date: Thu, 5 Nov 2015 16:06:02 +0100 Subject: [PATCH] remove check for nationalPrefixFormattingRule empty before setting nationalPrefixOptionalWhenFormatting in BuildMetadataFromXml --- .../i18n/phonenumbers/BuildMetadataFromXml.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java index d36273f8b..e5407f8e8 100644 --- a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java +++ b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java @@ -319,14 +319,12 @@ public class BuildMetadataFromXml { format.setNationalPrefixFormattingRule(nationalPrefixFormattingRule); } - if (format.hasNationalPrefixFormattingRule()) { - if (numberFormatElement.hasAttribute(NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)) { - format.setNationalPrefixOptionalWhenFormatting( - Boolean.valueOf(numberFormatElement.getAttribute( - NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING))); - } else { - format.setNationalPrefixOptionalWhenFormatting(nationalPrefixOptionalWhenFormatting); - } + if (numberFormatElement.hasAttribute(NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)) { + format.setNationalPrefixOptionalWhenFormatting( + Boolean.valueOf(numberFormatElement.getAttribute( + NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING))); + } else { + format.setNationalPrefixOptionalWhenFormatting(nationalPrefixOptionalWhenFormatting); } if (numberFormatElement.hasAttribute(CARRIER_CODE_FORMATTING_RULE)) { format.setDomesticCarrierCodeFormattingRule(validateRE(