Minor changes for 1.7.

Author: rstam

Bson/Serialization/BsonClassMap.cs

@@ -265,7 +265,7 @@ public static Type GetMemberInfoType(MemberInfo memberInfo)
         }
 
         /// <summary>
-        /// Returns all registered class maps.
+        /// Gets all registered class maps.
         /// </summary>
         public static IEnumerable<BsonClassMap> GetRegisteredClassMaps()
         {

BsonUnitTests/DefaultSerializer/BsonClassMapTests.cs

@@ -312,6 +312,8 @@ public void TestIsClassMapRegistered()
     [TestFixture]
     public class BsonClassMapGetRegisteredClassMapTests
     {
+        private static bool __firstTime = true;
+
         public class C
         {
             public ObjectId Id;
@@ -327,17 +329,22 @@ public class D
         [Test]
         public void TestGetRegisteredClassMaps()
         {
-            Assert.IsFalse(BsonClassMap.IsClassMapRegistered(typeof(C)));
-            Assert.IsFalse(BsonClassMap.IsClassMapRegistered(typeof(D)));
-            BsonClassMap.RegisterClassMap<C>(cm => cm.AutoMap());
-            BsonClassMap.RegisterClassMap<D>(cm => cm.AutoMap());
-
-            var classMaps = BsonClassMap.GetRegisteredClassMaps();
-            var classMapTypes = classMaps.Select(x => x.ClassType).ToList();
-
-            Assert.IsTrue(BsonClassMap.IsClassMapRegistered(typeof(C)));
-            Assert.Contains(typeof(C), classMapTypes);
-            Assert.Contains(typeof(D), classMapTypes);
+            // this unit test can only be run once (per process)
+            if (__firstTime)
+            {
+                Assert.IsFalse(BsonClassMap.IsClassMapRegistered(typeof(C)));
+                Assert.IsFalse(BsonClassMap.IsClassMapRegistered(typeof(D)));
+                BsonClassMap.RegisterClassMap<C>(cm => cm.AutoMap());
+                BsonClassMap.RegisterClassMap<D>(cm => cm.AutoMap());
+
+                var classMaps = BsonClassMap.GetRegisteredClassMaps();
+                var classMapTypes = classMaps.Select(x => x.ClassType).ToList();
+
+                Assert.IsTrue(BsonClassMap.IsClassMapRegistered(typeof(C)));
+                Assert.Contains(typeof(C), classMapTypes);
+                Assert.Contains(typeof(D), classMapTypes);
+                __firstTime = false;
+            }
         }
     }
 

Driver/Core/WriteConcern.cs

@@ -290,9 +290,6 @@ public WriteConcern Freeze()
         {
             if (!_isFrozen)
             {
-                _frozenHashCode = GetHashCode();
-                _isFrozen = true;
-
                 if (_fsync.HasValue || _journal.HasValue)
                 {
                     if (_w != null && _w is WCount && ((WCount)_w).Value == 0)
@@ -306,6 +303,9 @@ public WriteConcern Freeze()
                 {
                     throw new MongoException("WTimeout may not be set unless W is set also.");
                 }
+
+                _frozenHashCode = GetHashCode();
+                _isFrozen = true;
             }
             return this;
         }