Merge branch 'csharp_467' of git://github.com/craiggwilson/mongo-csharp-driver into csharp467

Author: Robert Stam

Bson/Serialization/BsonMemberMap.cs

@@ -52,6 +52,7 @@ public class BsonMemberMap
         private bool _ignoreIfDefault;
         private bool _ignoreIfNull;
         private object _defaultValue;
+        private bool _defaultValueSpecified;
 
         // constructors
         /// <summary>
@@ -65,6 +66,7 @@ public BsonMemberMap(BsonClassMap classMap, MemberInfo memberInfo)
             _memberInfo = memberInfo;
             _memberType = BsonClassMap.GetMemberInfoType(memberInfo);
             _defaultValue = GetDefaultValue(_memberType);
+            _defaultValueSpecified = false;
         }
 
         // public properties
@@ -277,7 +279,10 @@ public bool IsReadOnly
         /// <param name="obj">The object.</param>
         public void ApplyDefaultValue(object obj)
         {
-            this.Setter(obj, _defaultValue);
+            if (_defaultValueSpecified)
+            {
+                this.Setter(obj, _defaultValue);
+            }
         }
 
         /// <summary>
@@ -321,6 +326,7 @@ public IBsonSerializer GetSerializer(Type actualType)
         public BsonMemberMap SetDefaultValue(object defaultValue)
         {
             _defaultValue = defaultValue;
+            _defaultValueSpecified = true;
             return this;
         }
 

BsonUnitTests/Jira/CSharp467Tests.cs

@@ -0,0 +1,59 @@
+/* Copyright 2010-2012 10gen Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace MongoDB.BsonUnitTests.Jira
+{
+    [TestFixture]
+    public class CSharp467Tests
+    {
+        public class A
+        {
+            public string Value1 { get; set; }
+            public string Value2 { get; set; }
+            [BsonDefaultValue("Three")]
+            public string Value3 { get; set; }
+
+            public A()
+            {
+                Value1 = "Default";
+                Value2 = "Default";
+            }
+        }
+
+        [Test]
+        public void TestOnlySpecifiedValuesAndSpecifiedDefaultValuesAreWrittenUponDeserialization()
+        {
+            var doc = new BsonDocument
+            {
+                new BsonElement("Value1", "One")
+            };
+
+            var bson = doc.ToBson();
+            var rehydrated = BsonSerializer.Deserialize<A>(bson);
+
+            Assert.AreEqual(rehydrated.Value1, "One");
+            Assert.AreEqual(rehydrated.Value2, "Default");
+            Assert.AreEqual(rehydrated.Value3, "Three");
+        }
+    }
+}