CSHARP-1903: Fix minor bug in use cursor with latest server version.

rstam · rstam · commit 6e44d1f07a59 · 2017-02-12T22:38:23.000-05:00
diff --git a/src/MongoDB.Driver.Core/Core/Operations/AggregateOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/AggregateOperation.cs
@@ -266,12 +266,14 @@ private ReadCommandOperation<AggregateResult> CreateOperation(IChannelHandle cha
 
         private AsyncCursor<TResult> CreateCursor(IChannelSourceHandle channelSource, IChannelHandle channel, BsonDocument command, AggregateResult result)
         {
-            if (Feature.AggregateCursorResult.IsSupported(channel.ConnectionDescription.ServerVersion) && _useCursor.GetValueOrDefault(true))
+            if (result.CursorId.HasValue)
             {
                 return CreateCursorFromCursorResult(channelSource, command, result);
             }
-
-            return CreateCursorFromInlineResult(command, result);
+            else
+            {
+                return CreateCursorFromInlineResult(command, result);
+            }
         }
 
         private AsyncCursor<TResult> CreateCursorFromCursorResult(IChannelSourceHandle channelSource, BsonDocument command, AggregateResult result)

Original file line number	Diff line number	Diff line change
`@@ -266,12 +266,14 @@ private ReadCommandOperation<AggregateResult> CreateOperation(IChannelHandle cha`
`266`	`266`
`267`	`267`	`private AsyncCursor<TResult> CreateCursor(IChannelSourceHandle channelSource, IChannelHandle channel, BsonDocument command, AggregateResult result)`
`268`	`268`	`{`
`269`		`- if (Feature.AggregateCursorResult.IsSupported(channel.ConnectionDescription.ServerVersion) && _useCursor.GetValueOrDefault(true))`
	`269`	`+ if (result.CursorId.HasValue)`
`270`	`270`	`{`
`271`	`271`	`return CreateCursorFromCursorResult(channelSource, command, result);`
`272`	`272`	`}`
`273`		`-`
`274`		`- return CreateCursorFromInlineResult(command, result);`
	`273`	`+ else`
	`274`	`+ {`
	`275`	`+ return CreateCursorFromInlineResult(command, result);`
	`276`	`+ }`
`275`	`277`	`}`
`276`	`278`
`277`	`279`	`private AsyncCursor<TResult> CreateCursorFromCursorResult(IChannelSourceHandle channelSource, BsonDocument command, AggregateResult result)`