Fixwa

Author: papafe

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/JsonEncoders/ReplyMessageJsonEncoder.cs

@@ -36,7 +36,7 @@ public ReplyMessageJsonEncoder(TextReader textReader, TextWriter textWriter, Mes
             : base(textReader, textWriter, encoderSettings)
         {
             _serializer = Ensure.IsNotNull(serializer, nameof(serializer));
-            _serializationDomain = encoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null);
+            _serializationDomain = encoderSettings?.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null) ?? BsonSerializer.DefaultSerializationDomain;
         }
 
         // methods

tests/MongoDB.Driver.Tests/Core/Operations/AsyncCursorTests.cs

@@ -443,7 +443,8 @@ public void GetMore_should_use_same_session(
                         null,
                         CommandResponseHandling.Return,
                         It.IsAny<IBsonSerializer<BsonDocument>>(),
-                        It.IsAny<MessageEncoderSettings>()))
+                        It.IsAny<MessageEncoderSettings>(),
+                        It.IsAny<IBsonSerializationDomain>()))
                     .Callback(() => sameSessionWasUsed = true)
                     .Returns(Task.FromResult(secondBatch));
 
@@ -465,8 +466,9 @@ public void GetMore_should_use_same_session(
                         null,
                         CommandResponseHandling.Return,
                         It.IsAny<IBsonSerializer<BsonDocument>>(),
-                        It.IsAny<MessageEncoderSettings>()))
-                    .Callback(() => sameSessionWasUsed = true)
+                        It.IsAny<MessageEncoderSettings>(),
+                        It.IsAny<IBsonSerializationDomain>()))
+                        .Callback(() => sameSessionWasUsed = true)
                     .Returns(secondBatch);
 
                 subject.MoveNext(CancellationToken.None);
@@ -607,7 +609,8 @@ private void VerifyHowManyTimesKillCursorsCommandWasCalled(Mock<IChannelHandle>
                         It.IsAny<Action<IMessageEncoderPostProcessor>>(),
                         It.IsAny<CommandResponseHandling>(),
                         It.IsAny<IBsonSerializer<BsonDocument>>(),
-                        It.IsAny<MessageEncoderSettings>()),
+                        It.IsAny<MessageEncoderSettings>(),
+                        It.IsAny<IBsonSerializationDomain>()),
                     times);
             }
             else
@@ -625,7 +628,8 @@ private void VerifyHowManyTimesKillCursorsCommandWasCalled(Mock<IChannelHandle>
                         It.IsAny<Action<IMessageEncoderPostProcessor>>(),
                         It.IsAny<CommandResponseHandling>(),
                         It.IsAny<IBsonSerializer<BsonDocument>>(),
-                        It.IsAny<MessageEncoderSettings>()),
+                        It.IsAny<MessageEncoderSettings>(),
+                        It.IsAny<IBsonSerializationDomain>()),
                     times);
             }
         }