Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r68f69d1b55ec8a2b5804548507740706b5d824cc -r889e8e4ee8267b316e00e8f8a1035c60afb200a0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 68f69d1b55ec8a2b5804548507740706b5d824cc) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 889e8e4ee8267b316e00e8f8a1035c60afb200a0) @@ -45,6 +45,7 @@ using Ringtoets.HydraRing.Calculation.Exceptions; using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources; using RingtoetsCommonForms = Ringtoets.Common.Forms.Properties.Resources; +using HydraRingGeneralResult = Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints.GeneralResult; namespace Ringtoets.GrassCoverErosionInwards.Service { @@ -179,7 +180,11 @@ if (dikeHeightOutput != null && calculation.InputParameters.ShouldDikeHeightIllustrationPointsBeCalculated) { - dikeHeightOutput.GeneralFaultTreeIllustrationPoint = ConvertIllustrationPointsResult(dikeHeightCalculator.IllustrationPointsResult, dikeHeightCalculator.IllustrationPointsParserErrorMessage); + GeneralResult illustrationPoints = ConvertIllustrationPointsResult(dikeHeightCalculator.IllustrationPointsResult, dikeHeightCalculator.IllustrationPointsParserErrorMessage); + if (illustrationPoints != null) + { + dikeHeightOutput.SetGeneralResult(illustrationPoints); + } } if (canceled) @@ -195,7 +200,11 @@ numberOfCalculators); if (overtoppingRateOutput != null && calculation.InputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated) { - overtoppingRateOutput.GeneralFaultTreeIllustrationPoint = ConvertIllustrationPointsResult(overtoppingRateCalculator.IllustrationPointsResult, overtoppingRateCalculator.IllustrationPointsParserErrorMessage); + GeneralResult illustrationPoints = ConvertIllustrationPointsResult(overtoppingRateCalculator.IllustrationPointsResult, overtoppingRateCalculator.IllustrationPointsParserErrorMessage); + if (illustrationPoints != null) + { + overtoppingRateOutput.SetGeneralResult(illustrationPoints); + } } if (canceled) @@ -213,7 +222,11 @@ if (calculation.InputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated) { - overtoppingOutput.GeneralFaultTreeIllustrationPoint = ConvertIllustrationPointsResult(overtoppingCalculator.IllustrationPointsResult, overtoppingCalculator.IllustrationPointsParserErrorMessage); + GeneralResult illustrationPoints = ConvertIllustrationPointsResult(overtoppingCalculator.IllustrationPointsResult, overtoppingCalculator.IllustrationPointsParserErrorMessage); + if (illustrationPoints != null) + { + overtoppingOutput.SetGeneralResult(illustrationPoints); + } } calculation.Output = new GrassCoverErosionInwardsOutput( @@ -727,12 +740,15 @@ /// /// The to base the /// to create on. - /// - public GeneralResult ConvertIllustrationPointsResult(GeneralResult result, string errorMessage) + /// Error message to display when the general result is null + private static GeneralResult ConvertIllustrationPointsResult(HydraRingGeneralResult result, string errorMessage) { if (result == null) { - log.Warn(errorMessage); + if (errorMessage != null) + { + log.Warn(errorMessage); + } return null; } @@ -744,7 +760,7 @@ } catch (IllustrationPointConversionException e) { - log.Warn(Resources.SetIllustrationPointsResult_Converting_IllustrationPointResult_Failed, e); + log.Warn(RingtoetsCommonServiceResources.SetIllustrationPointsResult_Converting_IllustrationPointResult_Failed, e); } return null;