Supporting empty data specifications while conversion

admin-shell-io · Oct 12, 2023 · 4dbfada · 4dbfada
1 parent e86c112
commit 4dbfada
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/AasCore.Aas3_0/xmlization.cs b/src/AasCore.Aas3_0/xmlization.cs
@@ -3,12 +3,11 @@
  * Do NOT edit or append.
  */
 
+using System.Collections.Generic;  // can't alias
 using Aas = AasCore.Aas3_0;  // renamed
 using CodeAnalysis = System.Diagnostics.CodeAnalysis;
 using Xml = System.Xml;
 
-using System.Collections.Generic;  // can't alias
-
 namespace AasCore.Aas3_0
 {
     /// <summary>
@@ -24657,6 +24656,10 @@ private void ReferenceToSequence(
                 Aas.IReference that,
                 Xml.XmlWriter writer)
             {
+                if (that == null)
+                {
+                    return;
+                }
                 writer.WriteStartElement(
                     "type",
                     NS);

diff --git a/src/AasxCsharpLibrary/Extensions/ExtendISubmodelElement.cs b/src/AasxCsharpLibrary/Extensions/ExtendISubmodelElement.cs
@@ -359,13 +359,10 @@ private static void BasicConversionFromV10(this ISubmodelElement submodelElement
                 }
             }
 
-            if (sourceSubmodelElement.hasDataSpecification != null)
+            if (sourceSubmodelElement.hasDataSpecification != null && !sourceSubmodelElement.hasDataSpecification.reference.IsNullOrEmpty())
             {
                 //TODO (jtikekar, 0000-00-00): EmbeddedDataSpecification?? (as per old implementation)
-                if (submodelElement.EmbeddedDataSpecifications == null)
-                {
-                    submodelElement.EmbeddedDataSpecifications = new List<IEmbeddedDataSpecification>();
-                }
+                submodelElement.EmbeddedDataSpecifications ??= new List<IEmbeddedDataSpecification>();
                 foreach (var dataSpecification in sourceSubmodelElement.hasDataSpecification.reference)
                 {
                     if (!dataSpecification.IsEmpty)