CSHARP-1546: Set CurrentElementName to null instead of "?" when SkipName is called.

rstam · rstam · commit 7d91245a0be5 · 2016-03-17T16:51:38.000-04:00
diff --git a/src/MongoDB.Bson/IO/BsonBinaryReader.cs b/src/MongoDB.Bson/IO/BsonBinaryReader.cs
@@ -674,7 +674,7 @@ public override void SkipName()
             }
 
             _bsonStream.SkipCString();
-            CurrentName = "?";
+            CurrentName = null;
             State = BsonReaderState.Value;
 
             if (_context.ContextType == ContextType.Document)
@@ -773,7 +773,7 @@ private string GenerateDottedElementName(BsonBinaryReaderContext context, string
         {
             if (context.ContextType == ContextType.Document)
             {
-                return GenerateDottedElementName(context.ParentContext, context.CurrentElementName + "." + elementName);
+                return GenerateDottedElementName(context.ParentContext, (context.CurrentElementName ?? "?") + "." + elementName);
             }
             else if (context.ContextType == ContextType.Array)
             {

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ public override void SkipName()`
`674`	`674`	`}`
`675`	`675`
`676`	`676`	`_bsonStream.SkipCString();`
`677`		`- CurrentName = "?";`
	`677`	`+ CurrentName = null;`
`678`	`678`	`State = BsonReaderState.Value;`
`679`	`679`
`680`	`680`	`if (_context.ContextType == ContextType.Document)`
`@@ -773,7 +773,7 @@ private string GenerateDottedElementName(BsonBinaryReaderContext context, string`
`773`	`773`	`{`
`774`	`774`	`if (context.ContextType == ContextType.Document)`
`775`	`775`	`{`
`776`		`- return GenerateDottedElementName(context.ParentContext, context.CurrentElementName + "." + elementName);`
	`776`	`+ return GenerateDottedElementName(context.ParentContext, (context.CurrentElementName ?? "?") + "." + elementName);`
`777`	`777`	`}`
`778`	`778`	`else if (context.ContextType == ContextType.Array)`
`779`	`779`	`{`