Merge master into add-additional-properties

hypar-io · Dec 13, 2023 · dc5411e · dc5411e
2 parents fa49f5d + 001c0f6
commit dc5411e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Elements/src/Serialization/JSON/JsonInheritanceConverter.cs b/Elements/src/Serialization/JSON/JsonInheritanceConverter.cs
@@ -353,12 +353,12 @@ private System.Type GetObjectSubtype(System.Type objectType, string discriminato
 
             // If it's not in the type cache see if it's got a representation.
             // Import it as a GeometricElement.
-            if (jObject.TryGetValue("Representation", out _))
+            if (jObject.TryGetValue("Representation", out _) && discriminator != null)
             {
                 return typeof(GeometricElement);
             }
             // If nothing else has worked, see if it has an ID and treat it as a generic element
-            if (jObject.TryGetValue("Id", out _))
+            if (jObject.TryGetValue("Id", out _) && discriminator != null)
             {
                 return typeof(Element);
             }