Fix issue mapping from nullable bool to bool value

ServiceStack · Jul 26, 2023 · 61343f3 · 61343f3
1 parent 8c947ce
commit 61343f3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/ServiceStack.Text/src/ServiceStack.Text/AutoMappingUtils.cs b/ServiceStack.Text/src/ServiceStack.Text/AutoMappingUtils.cs
@@ -1170,7 +1170,8 @@ public void Populate(object to, object from)
                     var fromValue = assignmentEntry.GetValueFn(from);
 
                     if (valuePredicate != null
-                        && fromType == toType) // don't short-circuit nullable <-> non-null values
+                        && (fromType == toType
+                            || Nullable.GetUnderlyingType(fromType) == toType)) // don't short-circuit nullable <-> non-null values
                     {
                         if (!valuePredicate(fromValue, fromMember.PropertyInfo.PropertyType)) 
                             continue;

diff --git a/ServiceStack.Text/tests/ServiceStack.Text.Tests/AutoMappingTests.cs b/ServiceStack.Text/tests/ServiceStack.Text.Tests/AutoMappingTests.cs
@@ -1758,6 +1758,7 @@ class NullableSource
         public int? NullableIdNonMatchingUnderlyingType { get; set; }
         public int? NullableIdMatchingUnderlyingType { get; set; }
         public DateTime? DateTime { get; set; }
+        public bool NullableBool { get; set; }
     }
     class NullableTarget
     {
@@ -1767,6 +1768,7 @@ class NullableTarget
         public DateTime? NullableDateTime { get; set; }
         public DateTime DateTime { get; set; }
         public DateTime TargetOnlyDateTime { get; set; }
+        public bool? NullableBool { get; set; }
     }
 
     [Test]
@@ -1782,4 +1784,17 @@ public void Does_convert_nullables_of_different_types()
         Assert.That(target.DateTime, Is.EqualTo(default(DateTime)));
         Assert.That(target.TargetOnlyDateTime, Is.EqualTo(default(DateTime)));
     }
+
+    [Test]
+    public void Does_not_populate_bool_with_nullable_bool()
+    {
+        var to = new NullableSource {
+            NullableBool = true,
+        };
+
+        var from = new NullableTarget();
+        to.PopulateWithNonDefaultValues(from);
+
+        Assert.That(to.NullableBool, Is.True);
+    }
 }