From 7ece973c2f3d694b4005ddf5765509670bd82ffc Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Fri, 24 Jul 2020 13:42:11 -0400 Subject: [PATCH] fix: Workaround for logged XML format exceptions when failing to parse floats --- CHANGELOG.md | 1 + ICD.Common.Utils/Xml/IcdXmlReader.cs | 22 ++++++---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 633de62..e885642 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Repeater changed to use configured callbacks instead of a dumb event - Scheduled action callbacks allow a TimeSpan to be returned to delay actions + - Workaround for logged XML format exceptions when failing to parse floats ## [12.1.0] - 2020-07-14 ### Added diff --git a/ICD.Common.Utils/Xml/IcdXmlReader.cs b/ICD.Common.Utils/Xml/IcdXmlReader.cs index 18e2af1..86d25ec 100644 --- a/ICD.Common.Utils/Xml/IcdXmlReader.cs +++ b/ICD.Common.Utils/Xml/IcdXmlReader.cs @@ -177,26 +177,16 @@ namespace ICD.Common.Utils.Xml public long ReadElementContentAsLong() { - try - { - return m_Reader.ReadElementContentAsLong(); - } - catch (XmlException e) - { - throw new IcdXmlException(e); - } + // ReadElementContentAsLong() logs and throws... + string value = ReadElementContentAsString(); + return long.Parse(value); } public float ReadElementContentAsFloat() { - try - { - return m_Reader.ReadElementContentAsFloat(); - } - catch (XmlException e) - { - throw new IcdXmlException(e); - } + // ReadElementContentAsFloat() logs and throws... + string value = ReadElementContentAsString(); + return float.Parse(value); } public bool ReadElementContentAsBoolean()