Allow to deserialize propertys with nullable values.

sunnanking · May 12, 2010 · a4046e7 · a4046e7
1 parent 79eebe4
commit a4046e7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/source/MongoDB.Tests/UnitTests/Serialization/SerializationFactoryTests.cs b/source/MongoDB.Tests/UnitTests/Serialization/SerializationFactoryTests.cs
@@ -87,5 +87,32 @@ public void CanNotSetPrivatePropertys()
             Assert.IsNotNull(prop);
             Assert.AreEqual(0, prop.GetProperty());
         }
+
+        public class NullableProperty
+        {
+            public double? Value { get; set; }
+        }
+
+        [Test]
+        public void CanSetNullOnNullablPropertys()
+        {
+            var bson = Serialize(new Document("Value", null));
+
+            var obj = Deserialize<NullableProperty>(bson);
+
+            Assert.IsNotNull(obj);
+            Assert.IsNull(obj.Value);
+        }
+
+        [Test]
+        public void CanSetValueOnNullablPropertys()
+        {
+            var bson = Serialize(new Document("Value", 10));
+
+            var obj = Deserialize<NullableProperty>(bson);
+
+            Assert.IsNotNull(obj);
+            Assert.AreEqual(10,obj.Value);
+        }
     }
 }
diff --git a/source/MongoDB/Configuration/Mapping/Model/MemberMapBase.cs b/source/MongoDB/Configuration/Mapping/Model/MemberMapBase.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 
 namespace MongoDB.Configuration.Mapping.Model
 {
@@ -73,6 +74,12 @@ public virtual void SetValue(object instance, object value)
 
                     if(_memberReturnType.IsEnum)
                         value = Enum.ToObject(_memberReturnType, value);
+                    else if(_memberReturnType.IsGenericType && 
+                        _memberReturnType.GetGenericTypeDefinition() == typeof(Nullable<>))
+                    {
+                        if(value!=null)
+                            value = Convert.ChangeType(value, _memberReturnType.GetGenericArguments().First());
+                    }
                     else if(code != TypeCode.Object)
                         value = Convert.ChangeType(value, _memberReturnType);
                 }