From 63899401bbe956f8f53f3aed613f8eae8d62fa4f Mon Sep 17 00:00:00 2001 From: Thomas Wiedebusch Date: Fri, 22 Apr 2022 07:30:00 +0200 Subject: [PATCH] MeterFwUpdate: - renamed SetLoadedFiles to ValidateLoadedFiles, - corrected return (was always true) --- .../Genesis/GenesisFile/MeterFwUpdate.cs | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFwUpdate.cs b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFwUpdate.cs index 1305c066..df3eb19b 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFwUpdate.cs +++ b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFwUpdate.cs @@ -1223,7 +1223,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile } } - return SetLoadedFiles(); + return ValidateLoadedFiles(); } @@ -1246,7 +1246,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile { FileApps.Clear(); FileApps.AddRange(sourceFileApps); - return SetLoadedFiles(); + return ValidateLoadedFiles(); } /// @@ -1276,16 +1276,26 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile FileApps.Add(fileApplication); } - return SetLoadedFiles(); + return ValidateLoadedFiles(); } - private Boolean SetLoadedFiles() + /// + /// Common validation of loaded file apps. + /// + /// true if all applications are valid + /// + /// - Initial + /// + /// + /// - Corrected return value (was constantly true). + /// + private Boolean ValidateLoadedFiles() { var returnValue = true; + foreach (var fileApplication in FileApps) { - fileApplication.IsValid = CheckFileApp(fileApplication); if (!fileApplication.IsValid) { @@ -1296,7 +1306,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile _remainingFileAppsParts.Clear(); _succeededFileAppsParts.Clear(); _failedFileAppsParts.Clear(); - return true; + return returnValue; } ///