diff --git a/src/Moryx/Serialization/EntryConvert/EntryConvert.cs b/src/Moryx/Serialization/EntryConvert/EntryConvert.cs index 84f467ad8..4eacf1bb7 100644 --- a/src/Moryx/Serialization/EntryConvert/EntryConvert.cs +++ b/src/Moryx/Serialization/EntryConvert/EntryConvert.cs @@ -410,7 +410,7 @@ public static Entry EncodeObject(object instance, ICustomSerialization customSer { //exclude property that can lead to self reference var propertyType = property.PropertyType; - if (propertyType == instanceType) + if (propertyType == instanceType || propertyType.IsAssignableFrom(instanceType)) { continue; } diff --git a/src/Tests/Moryx.Tests/Serialization/EntrySerializeSerialization/EntrySerializeDummies.cs b/src/Tests/Moryx.Tests/Serialization/EntrySerializeSerialization/EntrySerializeDummies.cs index 3e320f26d..387f65206 100644 --- a/src/Tests/Moryx.Tests/Serialization/EntrySerializeSerialization/EntrySerializeDummies.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntrySerializeSerialization/EntrySerializeDummies.cs @@ -124,3 +124,12 @@ public class AlwaysAttributedDerivedType : NeverAttributedBaseType public bool NullProperty3 { get; set; } } + +public class SelfReferencingBase +{ + public SelfReferencingBase Self { get; set; } +} + +public class SelfReferencingDerived : SelfReferencingBase +{ +} diff --git a/src/Tests/Moryx.Tests/Serialization/EntrySerializeSerialization/EntrySerializeSerializationTests.cs b/src/Tests/Moryx.Tests/Serialization/EntrySerializeSerialization/EntrySerializeSerializationTests.cs index 140bd05c4..65c67db03 100644 --- a/src/Tests/Moryx.Tests/Serialization/EntrySerializeSerialization/EntrySerializeSerializationTests.cs +++ b/src/Tests/Moryx.Tests/Serialization/EntrySerializeSerialization/EntrySerializeSerializationTests.cs @@ -224,4 +224,13 @@ public void ClassWithSerializationAttribute() var alwaysProperties = 3; Assert.That(alwaysProperties, Is.EqualTo(encoded.SubEntries.Count)); } + + [Test] + public void SerializeClassWithSelfReference() + { + var instance = new SelfReferencingDerived(); + instance.Self = instance; + Assert.DoesNotThrow(() => EntryConvert.EncodeObject(instance)); + } } +