Skip to content

Missed "else" in property setter delegate. #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Missed "else" in property setter delegate. #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Fody/Cauldron.BasicInterceptors/Weaver_Property.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,8 @@ T CodeMe<T>(Func<Field, T> fieldCode, Func<Property, T> propertyCode) where T :
// Otherwise if the property is not a value type and nullable
else if (!propertyType.IsValueType || propertyType.IsNullable || propertyType.IsArray)
CodeMe<CoderBase>(
field => setterCode.SetValue(field, null),
property => setterCode.Call(property.Setter, null));
field => setterCode.SetValue(field, null).Return(),
property => setterCode.Call(property.Setter, null).Return());
else // otherwise... throw an exception
then.ThrowNew(typeof(NotSupportedException), "Value types does not accept null values.");

Expand Down
16 changes: 16 additions & 0 deletions UnitTests/Shared/MainTests/BasicInterceptors/Property_Interceptor_Code_Validation_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ public string ThisIsMyProperty
[TestPropertyInterceptor]
public long ValueTypePropertyPrivateSetter { get; private set; }

[TestPropertyInterceptor]
public int? NullableProperty { get; set; }

[TestMethod]
public void Array_Property_Setter()
{
Expand Down Expand Up @@ -198,6 +201,19 @@ public void ValueType_Property()
Assert.AreEqual(9999, this.ValueTypeProperty);
}

[TestMethod]
public void Nullable_Property()
{
this.NullableProperty = 113;
Assert.IsNull(this.NullableProperty);

this.NullableProperty = 121;
Assert.AreEqual(121, this.NullableProperty);

this.NullableProperty = null;
Assert.IsNull(this.NullableProperty);
}

private List<long> Blub()
{
return new List<long>();
Expand Down
3 changes: 3 additions & 0 deletions UnitTests/Shared/TestInterceptors/TestPropertyInterceptorAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ public void OnGet(PropertyInterceptionInfo propertyInterceptionInfo, object valu

if (Comparer.Equals(value, (double)66))
propertyInterceptionInfo.SetValue(78344.8f);

if (Comparer.Equals(value, (int)113))
propertyInterceptionInfo.SetValue(null);
}

public bool OnSet(PropertyInterceptionInfo propertyInterceptionInfo, object oldValue, object newValue)
Expand Down