Skip to content

Commit 3f9c37c

Browse files
committed
Small corrections
1 parent a45b027 commit 3f9c37c

File tree

5 files changed

+5
-3
lines changed

5 files changed

+5
-3
lines changed

src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private BsonDeserializationContext(
4141
_allowDuplicateElementNames = allowDuplicateElementNames;
4242
_dynamicArraySerializer = dynamicArraySerializer;
4343
_dynamicDocumentSerializer = dynamicDocumentSerializer;
44-
_domain = reader.Settings.SerializationDomain ?? BsonSerializer.DefaultDomain;
44+
_domain = reader.Settings?.SerializationDomain ?? BsonSerializer.DefaultDomain;
4545
}
4646

4747
// public properties

src/MongoDB.Bson/Serialization/BsonSerializationContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private BsonSerializationContext(
3535
{
3636
_writer = writer;
3737
_isDynamicType = isDynamicType;
38-
_domain = writer.Settings.SerializationDomain ?? BsonSerializer.DefaultDomain;
38+
_domain = writer.Settings?.SerializationDomain ?? BsonSerializer.DefaultDomain;
3939
}
4040

4141
// public properties

src/MongoDB.Driver/MongoCollectionSettings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ public virtual MongoCollectionSettings Clone()
180180
clone._readPreference = _readPreference.Clone();
181181
clone._writeConcern = _writeConcern.Clone();
182182
clone._writeEncoding = _writeEncoding.Clone();
183+
clone._serializationDomain = _serializationDomain; //TODO .clone...?
183184
return clone;
184185
}
185186

src/MongoDB.Driver/MongoDatabaseSettings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public MongoDatabaseSettings Clone()
164164
clone._readPreference = _readPreference.Clone();
165165
clone._writeConcern = _writeConcern.Clone();
166166
clone._writeEncoding = _writeEncoding.Clone();
167+
clone._serializationDomain = _serializationDomain;
167168
return clone;
168169
}
169170

tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentWrapperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public void TestCreateWithNominalTypeAndObject()
310310
Assert.Same(c, wrapper.Wrapped);
311311
Assert.Equal(false, wrapper.IsMaterialized);
312312

313-
wrapper = BsonDocumentWrapper.Create(typeof(C), null);
313+
wrapper = BsonDocumentWrapper.Create(typeof(C));
314314
Assert.Same(BsonSerializer.LookupSerializer(typeof(C)), wrapper.Serializer);
315315
Assert.Same(null, wrapper.Wrapped);
316316
Assert.Equal(false, wrapper.IsMaterialized);

0 commit comments

Comments
 (0)