Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs =================================================================== diff -u -rdb35fac9d09304befdae9dc51aa4ef734657f11b -r64fc75f87a85b4f20e9c5a8438cee659371d1efd --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision db35fac9d09304befdae9dc51aa4ef734657f11b) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableAssessmentSectionFactory.cs (.../ExportableAssessmentSectionFactory.cs) (revision 64fc75f87a85b4f20e9c5a8438cee659371d1efd) @@ -291,16 +291,14 @@ IdentifierGenerator idGenerator, ExportableModelRegistry registry, IAssessmentSection assessmentSection, IEnumerable combinedSectionAssemblyResults) { - IEnumerable failureMechanismsInAssembly = assessmentSection.GetFailureMechanisms() - .Concat(assessmentSection.SpecificFailureMechanisms) - .Where(fm => fm.InAssembly); - IEnumerable failureMechanismsInAssemblySectionCollections = - failureMechanismsInAssembly.Select(failureMechanism => ExportableFailureMechanismSectionCollectionFactory.CreateExportableFailureMechanismSectionCollection( - idGenerator, registry, failureMechanism.Sections)) - .ToArray(); + List failureMechanismSectionCollections = + assessmentSection.GetFailureMechanisms() + .Concat(assessmentSection.SpecificFailureMechanisms) + .Where(fm => fm.InAssembly) + .Select(failureMechanism => ExportableFailureMechanismSectionCollectionFactory.CreateExportableFailureMechanismSectionCollection( + idGenerator, registry, failureMechanism.Sections)) + .ToList(); - var failureMechanismSectionCollections = new List(); - failureMechanismSectionCollections.AddRange(failureMechanismsInAssemblySectionCollections); if (combinedSectionAssemblyResults.Any()) { failureMechanismSectionCollections.Add(ExportableFailureMechanismSectionCollectionFactory.CreateExportableFailureMechanismSectionCollection( Index: Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionCollectionFactory.cs =================================================================== diff -u -rdb35fac9d09304befdae9dc51aa4ef734657f11b -r64fc75f87a85b4f20e9c5a8438cee659371d1efd --- Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionCollectionFactory.cs (.../ExportableFailureMechanismSectionCollectionFactory.cs) (revision db35fac9d09304befdae9dc51aa4ef734657f11b) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Factories/ExportableFailureMechanismSectionCollectionFactory.cs (.../ExportableFailureMechanismSectionCollectionFactory.cs) (revision 64fc75f87a85b4f20e9c5a8438cee659371d1efd) @@ -75,7 +75,9 @@ startDistance = exportableFailureMechanismSection.EndDistance; } - return new ExportableFailureMechanismSectionCollection(idGenerator.GetUniqueId(Resources.ExportableFailureMechanismSectionCollection_IdPrefix), exportableSections); + return new ExportableFailureMechanismSectionCollection( + idGenerator.GetUniqueId(Resources.ExportableFailureMechanismSectionCollection_IdPrefix), + exportableSections); } /// @@ -114,14 +116,11 @@ throw new ArgumentNullException(nameof(assemblyResults)); } - IEnumerable exportableSections = + return new ExportableFailureMechanismSectionCollection( + idGenerator.GetUniqueId(Resources.ExportableFailureMechanismSectionCollection_IdPrefix), assemblyResults.Select(assemblyResult => ExportableFailureMechanismSectionFactory.CreateExportableCombinedFailureMechanismSection( idGenerator, registry, referenceLine, assemblyResult)) - .ToArray(); - - var exportableCollection = new ExportableFailureMechanismSectionCollection(idGenerator.GetUniqueId(Resources.ExportableFailureMechanismSectionCollection_IdPrefix), - exportableSections); - return exportableCollection; + .ToArray()); } } } \ No newline at end of file