Rely on the Deprecated serialiser if type is know but regular deseria…

…liser fails (inside of object changed)
BHoM · Nov 6, 2019 · 0e265c9 · 0e265c9
1 parent 38fc8fe
commit 0e265c9
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Serialiser_Engine/Objects/BsonSerializers/ObjectSerializer.cs b/Serialiser_Engine/Objects/BsonSerializers/ObjectSerializer.cs
@@ -288,11 +288,19 @@ private object DeserializeDiscriminatedValue(BsonDeserializationContext context,
             }
             catch
             {
-                // If failed, just return the custom object 
+                // If failed, try the deprecated object serialiser
                 context.Reader.ReturnToBookmark(bookmark);
-                Engine.Reflection.Compute.RecordWarning("Cannot find a definition of type " + actualType.FullName + " that matches the object to deserialise -> data returned as custom objects.");
-                IBsonSerializer customSerializer = BsonSerializer.LookupSerializer(typeof(CustomObject));
-                return customSerializer.Deserialize(context, args) as CustomObject;
+                IBsonSerializer customSerializer;
+                if (actualType != typeof(IDeprecated))
+                    customSerializer = BsonSerializer.LookupSerializer(typeof(IDeprecated));
+                else
+                {
+                    // Last resort: just return the custom object 
+                    Engine.Reflection.Compute.RecordWarning("Cannot find a definition of type " + actualType.FullName + " that matches the object to deserialise -> data returned as custom objects.");
+                    customSerializer = BsonSerializer.LookupSerializer(typeof(CustomObject));
+                }
+
+                return customSerializer.Deserialize(context, args);
             }
         }