Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/ServiceStack.Text/Common/DeserializeType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public static TypeAccessor Create(ITypeSerializer serializer, TypeConfig typeCon

private static SetPropertyDelegate GetSetPropertyMethod(TypeConfig typeConfig, PropertyInfo propertyInfo)
{
if (propertyInfo.ReflectedType() != propertyInfo.DeclaringType)
if (typeConfig.Type != propertyInfo.DeclaringType)
propertyInfo = propertyInfo.DeclaringType.GetPropertyInfo(propertyInfo.Name);

if (!propertyInfo.CanWrite && !typeConfig.EnableAnonymousFieldSetterses) return null;
Expand Down Expand Up @@ -345,7 +345,7 @@ public static TypeAccessor Create(ITypeSerializer serializer, TypeConfig typeCon

private static SetPropertyDelegate GetSetFieldMethod(TypeConfig typeConfig, FieldInfo fieldInfo)
{
if (fieldInfo.ReflectedType() != fieldInfo.DeclaringType)
if (typeConfig.Type != fieldInfo.DeclaringType)
fieldInfo = fieldInfo.DeclaringType.GetFieldInfo(fieldInfo.Name);

return PclExport.Instance.GetSetFieldMethod(fieldInfo);
Expand Down
40 changes: 40 additions & 0 deletions tests/ServiceStack.Text.Tests/JsonTests/InheritanceTests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ServiceStack.Text.Tests.JsonTests
{
[TestFixture]
class InheritanceTest
{
public class BaseClass
{
protected string base64Value = string.Empty;
public string Value { get { return this.base64Value; } private set { this.base64Value = value; } }

public void Set(string val)
{
this.base64Value = val;
}
}

public class Derived : BaseClass
{
}

[Test]
public void Can_deserialize_private_set_in_base_class()
{
var derived = new Derived();
derived.Set("test");

string serialized = derived.ToJson();
var deserialized = serialized.FromJson<Derived>();

Assert.That(deserialized.Value, Is.EqualTo("test"));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
<Compile Include="HttpUtilsTests.cs" />
<Compile Include="Issues\JsConfigIssues.cs" />
<Compile Include="JsonTests\InheritAbstractTests.cs" />
<Compile Include="JsonTests\InheritanceTests.cs" />
<Compile Include="JsonTests\JsonEnumTests.cs" />
<Compile Include="JsonTests\InvalidJsonTests.cs" />
<Compile Include="JsonTests\OnDeserializationErrorTests.cs" />
Expand Down