Small cleanup item; ReadName already returns null if CurrentName isn't a string.

optimiz3 · optimiz3 · commit adcaff5791a8 · 2012-06-06T21:58:34.000-07:00
diff --git a/Bson/Serialization/Serializers/KeyValuePairSerializer.cs b/Bson/Serialization/Serializers/KeyValuePairSerializer.cs
@@ -104,8 +104,7 @@ public override object Deserialize(
                 bool keyFound = false, valueFound = false;
                 while (bsonReader.ReadBsonType(__bsonTrie) != BsonType.EndOfDocument)
                 {
-                    bsonReader.ReadName();
-                    var elementName = bsonReader.CurrentName as string;
+                    var elementName = bsonReader.ReadName();
                     if (elementName != null)
                     {
                         var message = string.Format("Element '{0}' is not valid for KeyValuePairs (expecting 'k' or 'v').", elementName);

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,7 @@ public override object Deserialize(`
`104`	`104`	`bool keyFound = false, valueFound = false;`
`105`	`105`	`while (bsonReader.ReadBsonType(__bsonTrie) != BsonType.EndOfDocument)`
`106`	`106`	`{`
`107`		`- bsonReader.ReadName();`
`108`		`- var elementName = bsonReader.CurrentName as string;`
	`107`	`+ var elementName = bsonReader.ReadName();`
`109`	`108`	`if (elementName != null)`
`110`	`109`	`{`
`111`	`110`	`var message = string.Format("Element '{0}' is not valid for KeyValuePairs (expecting 'k' or 'v').", elementName);`