Merge Dispose

Author: edwardneal

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

@@ -71,8 +71,6 @@ protected TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalCo
 
         internal abstract uint WaitForSSLHandShakeToComplete(out int protocolVersion);
 
-        internal abstract void Dispose();
-
         internal abstract uint CheckConnection();
 
         internal int DecrementPendingCallbacks(bool release)

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

@@ -99,50 +99,6 @@ internal int DecrementPendingCallbacks(bool release)
             return remaining;
         }
 
-        internal void Dispose()
-        {
-
-            SafeHandle packetHandle = _sniPacket;
-            SafeHandle sessionHandle = _sessionHandle;
-            SafeHandle asyncAttnPacket = _sniAsyncAttnPacket;
-            _sniPacket = null;
-            _sessionHandle = null;
-            _sniAsyncAttnPacket = null;
-
-            DisposeCounters();
-
-            if (sessionHandle != null || packetHandle != null)
-            {
-                // Comment CloseMARSSession
-                // UNDONE - if there are pending reads or writes on logical connections, we need to block
-                // here for the callbacks!!!  This only applies to async.  Should be fixed by async fixes for
-                // AD unload/exit.
-
-                // TODO: Make this a BID trace point!
-                RuntimeHelpers.PrepareConstrainedRegions();
-                try
-                { }
-                finally
-                {
-                    if (packetHandle != null)
-                    {
-                        packetHandle.Dispose();
-                    }
-                    if (asyncAttnPacket != null)
-                    {
-                        asyncAttnPacket.Dispose();
-                    }
-                    if (sessionHandle != null)
-                    {
-                        sessionHandle.Dispose();
-                        DecrementPendingCallbacks(true); // Will dispose of GC handle.
-                    }
-                }
-            }
-
-            DisposePacketCache();
-        }
-
         /// <summary>
         /// Checks to see if the underlying connection is still valid (used by idle connection resiliency - for active connections)
         /// NOTE: This is not safe to do on a connection that is currently in use

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

@@ -208,6 +208,50 @@ protected override void RemovePacketFromPendingList(PacketHandle ptr)
             }
         }
 
+        internal override void Dispose()
+        {
+
+            SafeHandle packetHandle = _sniPacket;
+            SafeHandle sessionHandle = _sessionHandle;
+            SafeHandle asyncAttnPacket = _sniAsyncAttnPacket;
+            _sniPacket = null;
+            _sessionHandle = null;
+            _sniAsyncAttnPacket = null;
+
+            DisposeCounters();
+
+            if (sessionHandle != null || packetHandle != null)
+            {
+                // Comment CloseMARSSession
+                // UNDONE - if there are pending reads or writes on logical connections, we need to block
+                // here for the callbacks!!!  This only applies to async.  Should be fixed by async fixes for
+                // AD unload/exit.
+
+                // TODO: Make this a BID trace point!
+                RuntimeHelpers.PrepareConstrainedRegions();
+                try
+                { }
+                finally
+                {
+                    if (packetHandle != null)
+                    {
+                        packetHandle.Dispose();
+                    }
+                    if (asyncAttnPacket != null)
+                    {
+                        asyncAttnPacket.Dispose();
+                    }
+                    if (sessionHandle != null)
+                    {
+                        sessionHandle.Dispose();
+                        DecrementPendingCallbacks(true); // Will dispose of GC handle.
+                    }
+                }
+            }
+
+            DisposePacketCache();
+        }
+
         [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
         protected override void FreeGcHandle(int remaining, bool release)
         {

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

@@ -514,6 +514,8 @@ internal abstract void CreatePhysicalSNIHandle(
 
         protected abstract bool CheckPacket(PacketHandle packet, TaskCompletionSource<object> source);
 
+        internal abstract void Dispose();
+
         protected abstract void FreeGcHandle(int remaining, bool release);
 
         internal abstract bool IsFailedHandle();