Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs =================================================================== diff -u -rc1ae178a5c1aa92c14a9c71e9db0606b0de30385 -r0562f364928a2df1d89f8554c608f423cd781959 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision c1ae178a5c1aa92c14a9c71e9db0606b0de30385) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 0562f364928a2df1d89f8554c608f423cd781959) @@ -25,6 +25,7 @@ using log4net; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data; +using Ringtoets.Integration.Data.Merge; using Ringtoets.Integration.Forms.Merge; using Ringtoets.Integration.Plugin.Handlers; using Ringtoets.Integration.Plugin.Properties; @@ -136,22 +137,15 @@ return; } - if (!mergeDataProvider.SelectData(matchingAssessmentSections)) + AssessmentSectionMergeData mergeData = mergeDataProvider.SelectData(matchingAssessmentSections); + + if (mergeData == null) { LogCancelMessage(); return; } - AssessmentSection assessmentSectionToMerge = mergeDataProvider.SelectedAssessmentSection; - IEnumerable failureMechanismToMerge = mergeDataProvider.SelectedFailureMechanisms; - - if (assessmentSectionToMerge == null || failureMechanismToMerge == null) - { - LogError(Resources.AssessmentSectionMerger_No_AssessmentSection_selected); - return; - } - - PerformMerge(assessmentSection, assessmentSectionToMerge, failureMechanismToMerge); + PerformMerge(assessmentSection, mergeData.AssessmentSection, mergeData.FailureMechanisms); } private void PerformMerge(AssessmentSection assessmentSection, AssessmentSection assessmentSectionToMerge, IEnumerable failureMechanismToMerge)