Minor refactoring.

rstam · rstam · commit 98d73c9af1a9 · 2012-04-13T16:46:23.000-04:00
diff --git a/Bson/Serialization/BsonClassMapSerializer.cs b/Bson/Serialization/BsonClassMapSerializer.cs
@@ -142,15 +142,18 @@ public object Deserialize(
                     }
 
                     var memberMap = classMap.GetMemberMapForElement(elementName);
-                    if (memberMap != null && memberMap != classMap.ExtraElementsMemberMap && !memberMap.IsReadOnly)
+                    if (memberMap != null && memberMap != classMap.ExtraElementsMemberMap)
                     {
-                        DeserializeMember(bsonReader, obj, memberMap);
+                        if (memberMap.IsReadOnly)
+                        {
+                            bsonReader.SkipValue();
+                        }
+                        else
+                        {
+                            DeserializeMember(bsonReader, obj, memberMap);
+                        }
                         missingElementMemberMaps.Remove(memberMap);
                     }
-                    else if (memberMap != null && memberMap.IsReadOnly)
-                    {
-                        bsonReader.SkipValue();
-                    }
                     else
                     {
                         if (classMap.ExtraElementsMemberMap != null)

Original file line number	Diff line number	Diff line change
`@@ -142,15 +142,18 @@ public object Deserialize(`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`var memberMap = classMap.GetMemberMapForElement(elementName);`
`145`		`- if (memberMap != null && memberMap != classMap.ExtraElementsMemberMap && !memberMap.IsReadOnly)`
	`145`	`+ if (memberMap != null && memberMap != classMap.ExtraElementsMemberMap)`
`146`	`146`	`{`
`147`		`- DeserializeMember(bsonReader, obj, memberMap);`
	`147`	`+ if (memberMap.IsReadOnly)`
	`148`	`+ {`
	`149`	`+ bsonReader.SkipValue();`
	`150`	`+ }`
	`151`	`+ else`
	`152`	`+ {`
	`153`	`+ DeserializeMember(bsonReader, obj, memberMap);`
	`154`	`+ }`
`148`	`155`	`missingElementMemberMaps.Remove(memberMap);`
`149`	`156`	`}`
`150`		`- else if (memberMap != null && memberMap.IsReadOnly)`
`151`		`- {`
`152`		`- bsonReader.SkipValue();`
`153`		`- }`
`154`	`157`	`else`
`155`	`158`	`{`
`156`	`159`	`if (classMap.ExtraElementsMemberMap != null)`