Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -r7a3751ecfdc5e5a89e629da41fb7482f7b5ab0c8 -r5f7832f27f16712f80b184d82375d850dd46316f --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 7a3751ecfdc5e5a89e629da41fb7482f7b5ab0c8) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 5f7832f27f16712f80b184d82375d850dd46316f) @@ -181,23 +181,18 @@ { var changedObjects = new List(); - IEnumerable targetHydraulicBoundaryDatabasesFileNames = targetAssessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases - .Select(hbd => Path.GetFileNameWithoutExtension(hbd.FilePath)); + IEnumerable targetHydraulicBoundaryDatabasesFileNames = + targetAssessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases + .Select(hbd => Path.GetFileNameWithoutExtension(hbd.FilePath)); - IEnumerable overlappingDatabases = sourceAssessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases - .Where(hbd => targetHydraulicBoundaryDatabasesFileNames.Contains( - Path.GetFileNameWithoutExtension(hbd.FilePath))); - - IEnumerable databasesToAdd = sourceAssessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases - .Except(overlappingDatabases); - - if (databasesToAdd.Any()) + IEnumerable sourceHydraulicBoundaryDatabasesToAdd = + sourceAssessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases + .Where(hbd => !targetHydraulicBoundaryDatabasesFileNames.Contains( + Path.GetFileNameWithoutExtension(hbd.FilePath))); + + foreach (HydraulicBoundaryDatabase hydraulicBoundaryDatabase in sourceHydraulicBoundaryDatabasesToAdd) { - foreach (HydraulicBoundaryDatabase hydraulicBoundaryDatabase in databasesToAdd) - { - changedObjects.AddRange(hydraulicBoundaryDataUpdateHandler.AddHydraulicBoundaryDatabase( - hydraulicBoundaryDatabase)); - } + changedObjects.AddRange(hydraulicBoundaryDataUpdateHandler.AddHydraulicBoundaryDatabase(hydraulicBoundaryDatabase)); } return changedObjects;