CSHARP-656: Prevent registration of BsonValue related serializers.

mongodb · Jan 4, 2013 · a5d7325 · a5d7325
1 parent 4b552a6
commit a5d7325
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/MongoDB.Bson/Serialization/BsonDefaultSerializationProvider.cs b/MongoDB.Bson/Serialization/BsonDefaultSerializationProvider.cs
@@ -72,7 +72,6 @@ static BsonDefaultSerializationProvider()
                 { typeof(Double), typeof(DoubleSerializer) },
                 { typeof(System.Drawing.Size), typeof(DrawingSizeSerializer) },
                 { typeof(Guid), typeof(GuidSerializer) },
-                { typeof(IBsonSerializable), typeof(BsonIBsonSerializableSerializer) },
                 { typeof(Image), typeof(ImageSerializer) },
                 { typeof(Int16), typeof(Int16Serializer) },
                 { typeof(Int32), typeof(Int32Serializer) },
@@ -125,11 +124,18 @@ public IBsonSerializer GetSerializer(Type type)
                 return (IBsonSerializer)Activator.CreateInstance(serializerType);
             }
 
+            // use BsonDocumentSerializer for all subclasses of BsonDocument also
             if (typeof(BsonDocument).IsAssignableFrom(type))
             {
                 return BsonDocumentSerializer.Instance;
             }
 
+            // use BsonIBsonSerializableSerializer for all classes that implement IBsonSerializable
+            if (typeof(IBsonSerializable).IsAssignableFrom(type))
+            {
+                return BsonIBsonSerializableSerializer.Instance;
+            }
+
             if (type.IsGenericType)
             {
                 var genericTypeDefinition = type.GetGenericTypeDefinition();

diff --git a/MongoDB.Bson/Serialization/BsonSerializer.cs b/MongoDB.Bson/Serialization/BsonSerializer.cs
@@ -204,6 +204,7 @@ public static object Deserialize(BsonReader bsonReader, Type nominalType)
         /// <returns>An object.</returns>
         public static object Deserialize(BsonReader bsonReader, Type nominalType, IBsonSerializationOptions options)
         {
+            // since we don't allow registering serializers for BsonDocument no lookup is needed
             if (nominalType == typeof(BsonDocument))
             {
                 return BsonDocumentSerializer.Instance.Deserialize(bsonReader, nominalType, options);
@@ -738,13 +739,14 @@ public static void RegisterSerializationProvider(IBsonSerializationProvider prov
         /// <param name="serializer">The serializer.</param>
         public static void RegisterSerializer(Type type, IBsonSerializer serializer)
         {
-            // don't allow any serializers to be registered for subclasses of BsonDocument
+            // don't allow a serializer to be registered for subclasses of BsonValue
-            if (typeof(BsonDocument).IsAssignableFrom(type))
+            if (typeof(BsonValue).IsAssignableFrom(type))
             {
-                var message = string.Format("A serializer cannot be registered for type {0} because it is a subclass of BsonDocument.", BsonUtils.GetFriendlyTypeName(type));
+                var message = string.Format("A serializer cannot be registered for type {0} because it is a subclass of BsonValue.", BsonUtils.GetFriendlyTypeName(type));
                 throw new BsonSerializationException(message);
             }
 
+            // don't allow a serializer to be registered for classes that implement IBsonSerializable
             if (typeof(IBsonSerializable).IsAssignableFrom(type))
             {
                 var message = string.Format("A serializer cannot be registered for type {0} because it implements IBsonSerializable.", BsonUtils.GetFriendlyTypeName(type));