@@ -167,17 +167,17 @@ private ValueTask<Row> ScanRowAsync(IOBehavior ioBehavior, Row row, Cancellation
167
167
{
168
168
// if we've already read past the end of this resultset, Read returns false
169
169
if ( BufferState == ResultSetState . HasMoreData || BufferState == ResultSetState . NoMoreData || BufferState == ResultSetState . None )
170
- return new ValueTask < Row > ( ( Row ) null ) ;
170
+ return new ValueTask < Row > ( ( Row ) null ) ;
171
171
172
172
using ( Command . RegisterCancel ( cancellationToken ) )
173
173
{
174
174
var payloadValueTask = Session . ReceiveReplyAsync ( ioBehavior , CancellationToken . None ) ;
175
175
return payloadValueTask . IsCompletedSuccessfully
176
- ? new ValueTask < Row > ( ScanRowAsyncRemainder ( payloadValueTask . Result ) )
177
- : new ValueTask < Row > ( ScanRowAsyncAwaited ( payloadValueTask . AsTask ( ) , cancellationToken ) ) ;
176
+ ? new ValueTask < Row > ( ScanRowAsyncRemainder ( payloadValueTask . Result , row ) )
177
+ : new ValueTask < Row > ( ScanRowAsyncAwaited ( payloadValueTask . AsTask ( ) , row , cancellationToken ) ) ;
178
178
}
179
179
180
- async Task < Row > ScanRowAsyncAwaited ( Task < PayloadData > payloadTask , CancellationToken token )
180
+ async Task < Row > ScanRowAsyncAwaited ( Task < PayloadData > payloadTask , Row row_ , CancellationToken token )
181
181
{
182
182
PayloadData payloadData ;
183
183
try
@@ -191,10 +191,10 @@ async Task<Row> ScanRowAsyncAwaited(Task<PayloadData> payloadTask, CancellationT
191
191
token . ThrowIfCancellationRequested ( ) ;
192
192
throw ;
193
193
}
194
- return ScanRowAsyncRemainder ( payloadData ) ;
194
+ return ScanRowAsyncRemainder ( payloadData , row_ ) ;
195
195
}
196
196
197
- Row ScanRowAsyncRemainder ( PayloadData payload )
197
+ Row ScanRowAsyncRemainder ( PayloadData payload , Row row_ )
198
198
{
199
199
if ( payload . HeaderByte == EofPayload . Signature )
200
200
{
@@ -223,12 +223,12 @@ Row ScanRowAsyncRemainder(PayloadData payload)
223
223
reader . Offset += m_dataLengths [ column ] ;
224
224
}
225
225
226
- if ( row == null )
227
- row = new Row ( this ) ;
228
- row . SetData ( m_dataLengths , m_dataOffsets , payload . ArraySegment ) ;
229
- m_rowBuffered = row ;
226
+ if ( row_ == null )
227
+ row_ = new Row ( this ) ;
228
+ row_ . SetData ( m_dataLengths , m_dataOffsets , payload . ArraySegment ) ;
229
+ m_rowBuffered = row_ ;
230
230
m_hasRows = true ;
231
- return row ;
231
+ return row_ ;
232
232
}
233
233
}
234
234
0 commit comments