Skip to content

Commit e06dba9

Browse files
committed
Merge SniPacketGetData
1 parent 3b58d9b commit e06dba9

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ internal abstract void CreatePhysicalSNIHandle(
100100

101101
internal abstract uint CheckConnection();
102102

103-
protected abstract uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize);
104-
105103
internal abstract PacketHandle GetResetWritePacket(int dataSize);
106104

107105
internal abstract void ClearAllWritePackets();

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,6 @@ private uint GetSniPacket(PacketHandle packet, ref uint dataSize)
359359
return SniPacketGetData(packet, _inBuff, ref dataSize);
360360
}
361361

362-
private uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize)
363-
{
364-
Debug.Assert(packet.Type == PacketHandle.NativePointerType, "unexpected packet type when requiring NativePointer");
365-
return SniNativeWrapper.SniPacketGetData(packet.NativePointer, _inBuff, ref dataSize);
366-
}
367-
368362
public void ReadAsyncCallback(IntPtr key, PacketHandle packet, uint error)
369363
{
370364
// Key never used.

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ internal TdsParserStateObjectNative(TdsParser parser)
3131

3232
internal override Guid? SessionId => default;
3333

34+
protected override uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize)
35+
{
36+
Debug.Assert(packet.Type == PacketHandle.NativePointerType, "unexpected packet type when requiring NativePointer");
37+
return SniNativeWrapper.SniPacketGetData(packet.NativePointer, _inBuff, ref dataSize);
38+
}
39+
3440
internal override bool IsFailedHandle() => _sessionHandle.Status != TdsEnums.SNI_SUCCESS;
3541

3642
internal override bool IsPacketEmpty(PacketHandle readPacket)

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,8 @@ internal long TimeoutTime
481481

482482
internal abstract SessionHandle SessionHandle { get; }
483483

484+
protected abstract uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize);
485+
484486
internal abstract bool IsFailedHandle();
485487

486488
internal abstract bool IsPacketEmpty(PacketHandle readPacket);

0 commit comments

Comments
 (0)