Merge commit '29672a' into csharp452

Author: rstam

Bson/Serialization/BsonClassMapSerializer.cs

@@ -195,7 +195,7 @@ public object Deserialize(
                     for (;;)
                     {
                         // examine missing elements (memberMapBlock is shifted right as we work through the block)
-                        while ((memberMapBlock & 1) != 0)
+                        for (; (memberMapBlock & 1) != 0; ++memberMapIndex, memberMapBlock >>= 1)
                         {
                             var memberMap = allMemberMaps[memberMapIndex];
                             if (memberMap.IsReadOnly)
@@ -212,9 +212,6 @@ public object Deserialize(
                                 throw new FileFormatException(message);
                             }
                             memberMap.ApplyDefaultValue(obj);
-
-                            ++memberMapIndex;
-                            memberMapBlock >>= 1;
                         }
 
                         if (memberMapBlock == 0)

BsonUnitTests/BsonUnitTests.csproj

@@ -145,6 +145,7 @@
     <Compile Include="Jira\CSharp369Tests.cs" />
     <Compile Include="Jira\CSharp400Tests.cs" />
     <Compile Include="Jira\CSharp446Tests.cs" />
+    <Compile Include="Jira\CSharp452Tests.cs" />
     <Compile Include="Jira\CSharp70Tests.cs" />
     <Compile Include="Jira\CSharp71Tests.cs" />
     <Compile Include="Jira\CSharp74Tests.cs" />

BsonUnitTests/Jira/CSharp452Tests.cs

@@ -0,0 +1,75 @@
+/* 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 CSharp452Tests
+    {
+        public class A
+        {
+            private static readonly DateTime __staticTime = DateTime.UtcNow;
+
+            [BsonElement("a", Order = 0)]
+            [BsonIgnoreIfDefault]
+            public DateTime DateTime1
+            {
+                get;
+                set;
+            }
+
+            [BsonElement("b", Order = 1)]
+            [BsonIgnoreIfDefault]
+            public DateTime DateTime2
+            {
+                get
+                {
+                    return __staticTime;
+                }
+            }
+
+            [BsonElement("c", Order = 2)]
+            [BsonIgnoreIfDefault]
+            public DateTime DateTime3
+            {
+                get
+                {
+                    return DateTime.MinValue;
+                }
+            }
+        }
+
+        [Test]
+        public void TestReadonlyMembers()
+        {
+            var document = new A
+            {
+                DateTime1 = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc),
+            };
+
+            var bson = document.ToBson();
+            var rehydrated = BsonSerializer.Deserialize<A>(bson);
+            Assert.IsTrue(bson.SequenceEqual(rehydrated.ToBson()));
+        }
+    }
+}