From 34cfe8c7a35a429c137d03b0fac11d85a5fba09c Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 17 Aug 2020 10:01:58 -0400 Subject: [PATCH 1/2] fix: Workaround for logged XML format exceptions when failing to parse floats --- CHANGELOG.md | 3 +++ ICD.Common.Utils/Xml/IcdXmlReader.cs | 22 ++++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b80c258..c23a0e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Changed + - Workaround for logged XML format exceptions when failing to parse floats + ## [8.9.2] - 2020-07-28 ### Changed - StringExtensions - fixed an issue with IsNumeric where empty strings would return true 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() From 15330d7dd0a3e5922b266953906f2425d4e7d74e Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Mon, 17 Aug 2020 10:03:30 -0400 Subject: [PATCH 2/2] chore: Updating changelog, incrementing patch version --- CHANGELOG.md | 1 + ICD.Common.Utils/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c23a0e0..53a0a8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [8.9.3] - 2020-08-17 ### Changed - Workaround for logged XML format exceptions when failing to parse floats diff --git a/ICD.Common.Utils/Properties/AssemblyInfo.cs b/ICD.Common.Utils/Properties/AssemblyInfo.cs index b35da97..627fb21 100644 --- a/ICD.Common.Utils/Properties/AssemblyInfo.cs +++ b/ICD.Common.Utils/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Reflection; [assembly: AssemblyCompany("ICD Systems")] [assembly: AssemblyProduct("ICD.Common.Utils")] [assembly: AssemblyCopyright("Copyright © ICD Systems 2020")] -[assembly: AssemblyVersion("8.9.2.0")] +[assembly: AssemblyVersion("8.9.3.0")]