Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the issue 226 #228

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Fix the issue 226 #228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/AasxCsharpLibrary/Extensions/ExtendEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ This source code may use other Open Source software components (see LICENSE.txt)
using AdminShellNS.Extensions;
using Newtonsoft.Json;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down Expand Up @@ -497,8 +498,13 @@ public static ISubmodel FindSubmodel(this AasCore.Aas3_0.Environment environment
return null;
}

var submodels = environment.Submodels.Where(s => s.Id.Equals(key.Value, StringComparison.OrdinalIgnoreCase));
if (submodels.Any())
List<ISubmodel> submodels = null;
if (environment != null && !environment.Submodels.IsNullOrEmpty())
{
submodels = environment.Submodels.Where(s => s.Id.Equals(key.Value, StringComparison.OrdinalIgnoreCase)).ToList();

}
if (!submodels.IsNullOrEmpty())
{
return submodels.First();
}
Expand Down Expand Up @@ -1032,6 +1038,7 @@ public static IReference CopySubmodelRefAndCD(this AasCore.Aas3_0.Environment en
if (dstSub == null && copySubmodel)
{
dstSub = srcSub.Copy();
environment.Submodels ??= new List<ISubmodel>();
environment.Submodels.Add(dstSub);
}
else
Expand Down Expand Up @@ -1074,6 +1081,7 @@ private static void CopyConceptDescriptionsFrom(this AasCore.Aas3_0.Environment
if (cdDest == null)
{
// copy new
environment.ConceptDescriptions ??= new List<IConceptDescription>();
environment.ConceptDescriptions.Add(cdSrc.Copy());
}

Expand Down
Loading