Skip to content

Commit fc3c31e

Browse files
committed
Merge IsPacketEmpty
1 parent b1a4413 commit fc3c31e

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-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 void DisposePacketCache();
102102

103-
internal abstract bool IsPacketEmpty(PacketHandle readPacket);
104-
105103
internal abstract PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error);
106104

107105
internal abstract PacketHandle ReadAsync(SessionHandle handle, out uint error);

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
@@ -136,12 +136,6 @@ internal void CreatePhysicalSNIHandle(
136136
ipPreference, cachedDNSInfo, hostNameInCertificate);
137137
}
138138

139-
internal bool IsPacketEmpty(PacketHandle readPacket)
140-
{
141-
Debug.Assert(readPacket.Type == PacketHandle.NativePointerType || readPacket.Type == 0, "unexpected packet type when requiring NativePointer");
142-
return IntPtr.Zero == readPacket.NativePointer;
143-
}
144-
145139
internal PacketHandle ReadSyncOverAsync(int timeoutRemaining, out uint error)
146140
{
147141
SNIHandle handle = Handle ?? throw ADP.ClosedConnectionError();

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6+
using System.Diagnostics;
67
using Interop.Windows.Sni;
78

89
namespace Microsoft.Data.SqlClient
@@ -29,6 +30,12 @@ internal TdsParserStateObjectNative(TdsParser parser)
2930

3031
internal override Guid? SessionId => default;
3132

33+
internal override bool IsPacketEmpty(PacketHandle readPacket)
34+
{
35+
Debug.Assert(readPacket.Type == PacketHandle.NativePointerType || readPacket.Type == 0, "unexpected packet type when requiring NativePointer");
36+
return IntPtr.Zero == readPacket.NativePointer;
37+
}
38+
3239
internal override uint SniGetConnectionId(ref Guid clientConnectionId)
3340
=> SniNativeWrapper.SniGetConnectionId(Handle, ref clientConnectionId);
3441

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+
internal abstract bool IsPacketEmpty(PacketHandle readPacket);
485+
484486
internal abstract uint SniGetConnectionId(ref Guid clientConnectionId);
485487

486488
internal abstract uint DisableSsl();

0 commit comments

Comments
 (0)