Add comments that indicate where CER exception handling was removed

benrr101 · benrr101 · commit 3f29a698772a · 2025-08-22T14:52:58.000-05:00
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -1411,6 +1411,7 @@ private void BeginExecuteNonQueryInternalReadStage(TaskCompletionSource<object>
                 CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteNonQuery), _activeConnection);
                 _stateObj.ReadSni(completion);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             catch (Exception)
             {
                 // Similarly, if an exception occurs put the stateObj back into the pool.
@@ -1956,6 +1957,7 @@ private void BeginExecuteXmlReaderInternalReadStage(TaskCompletionSource<object>
                 CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteXmlReader), _activeConnection);
                 _stateObj.ReadSni(completion);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             catch (Exception e)
             {
                 // Similarly, if an exception occurs put the stateObj back into the pool.
@@ -2607,6 +2609,7 @@ private void BeginExecuteReaderInternalReadStage(TaskCompletionSource<object> co
                 CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteReader), _activeConnection);
                 _stateObj.ReadSni(completion);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             catch (Exception e)
             {
                 // Similarly, if an exception occurs put the stateObj back into the pool.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1243,6 +1243,7 @@ public override void ChangeDatabase(string database)
                 statistics = SqlStatistics.StartTimer(Statistics);
                 InnerConnection.ChangeDatabase(database);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             finally
             {
                 SqlStatistics.StopTimer(statistics);
@@ -1334,6 +1335,7 @@ public override void Close()
                         _statistics._closeTimestamp = ADP.TimerCurrent();
                     }
                 }
+                // @TODO: CER Exception Handling was removed here (see GH#3581)
                 catch (Exception ex)
                 {
                     e = ex;
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -570,6 +570,7 @@ internal SqlInternalConnectionTds(
                     }
                 }
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             finally
             {
                 ThreadHasParserLockForClose = false;
@@ -2130,6 +2131,7 @@ internal bool GetSessionAndReconnectIfNeeded(SqlConnection parent, int timeout =
                     return true;
                 }
                 return false;
+                // @TODO: CER Exception Handling was removed here (see GH#3581)
             }
             finally
             {
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -4716,6 +4716,7 @@ internal void DrainData(TdsParserStateObject stateObj)
                 }
                 Run(RunBehavior.Clean, null, null, null, stateObj);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             catch
             {
                 _connHandler.DoomThisConnection();
@@ -10213,6 +10214,7 @@ private void FinalizeExecuteRPC(TdsParserStateObject stateObj)
         private void TdsExecuteRPC_OnFailure(Exception exc, TdsParserStateObject stateObj)
         {
             FailureCleanup(stateObj, exc);
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
 
         private void ExecuteFlushTaskCallback(Task tsk, TdsParserStateObject stateObj, TaskCompletionSource<object> completion, bool releaseConnectionLock)
@@ -10228,6 +10230,7 @@ private void ExecuteFlushTaskCallback(Task tsk, TdsParserStateObject stateObj, T
                     {
                         FailureCleanup(stateObj, tsk.Exception);
                     }
+                    // @TODO: CER Exception Handling was removed here (see GH#3581)
                     catch (Exception e)
                     {
                         exc = e;
@@ -11923,6 +11926,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
                 }
 
                 return task ?? Task.CompletedTask;
+                // @TODO: CER Exception Handling was removed here (see GH#3581)
             }
 
             internal static void ValidateWriteParameters(byte[] buffer, int offset, int count)
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -515,6 +515,7 @@ private SqlCommand(SqlCommand from) : this()
                             // cleanup
                             Unprepare();
                         }
+                        // @TODO: CER Exception Handling was removed here (see GH#3581)
                         catch (Exception)
                         {
                             // we do not really care about errors in unprepare (may be the old connection went bad)
@@ -952,6 +953,7 @@ public override void Prepare()
 
                         InternalPrepare();
                     }
+                    // @TODO: CER Exception Handling was removed here (see GH#3581)
                     catch (Exception e)
                     {
                         processFinallyBlock = ADP.IsCatchableExceptionType(e);
@@ -1107,6 +1109,7 @@ public override void Cancel()
                                 }
                             }
                         }
+                        // @TODO: CER Exception Handling was removed here (see GH#3581)
                     }
                 }
                 finally
@@ -1420,6 +1423,7 @@ private void BeginExecuteNonQueryInternalReadStage(TaskCompletionSource<object>
                 CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteNonQuery), _activeConnection);
                 _stateObj.ReadSni(completion);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             catch (Exception)
             {
                 // Similarly, if an exception occurs put the stateObj back into the pool.
@@ -1693,6 +1697,7 @@ private object InternalEndExecuteNonQuery(
 
             Debug.Assert(_stateObj == null, "non-null state object in EndExecuteNonQuery");
             return _rowsAffected;
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
 
         private Task InternalExecuteNonQuery(
@@ -1776,6 +1781,7 @@ private Task InternalExecuteNonQuery(
             }
             Debug.Assert(isAsync || _stateObj == null, "non-null state object in InternalExecuteNonQuery");
             return task;
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
 
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/ExecuteXmlReader/*'/>
@@ -1954,6 +1960,7 @@ private void BeginExecuteXmlReaderInternalReadStage(TaskCompletionSource<object>
                 CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteXmlReader), _activeConnection);
                 _stateObj.ReadSni(completion);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             catch (Exception e)
             {
                 // Similarly, if an exception occurs put the stateObj back into the pool.
@@ -2160,6 +2167,7 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
                     sqlExceptionNumber = e.Number;
                     throw;
                 }
+                // @TODO: CER Exception Handling was removed here (see GH#3581)
                 finally
                 {
                     SqlStatistics.StopTimer(statistics);
@@ -2572,6 +2580,7 @@ private void BeginExecuteReaderInternalReadStage(TaskCompletionSource<object> co
                 CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteReader), _activeConnection);
                 _stateObj.ReadSni(completion);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             catch (Exception e)
             {
                 // Similarly, if an exception occurs put the stateObj back into the pool.
@@ -2602,6 +2611,7 @@ private SqlDataReader InternalEndExecuteReader(IAsyncResult asyncResult, bool is
             SqlDataReader reader = CompleteAsyncExecuteReader(isInternal);
             Debug.Assert(_stateObj == null, "non-null state object in InternalEndExecuteReader");
             return reader;
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
 
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/ExecuteNonQueryAsync[@name="CancellationToken"]/*'/>
@@ -4017,6 +4027,7 @@ private void PrepareForTransparentEncryption(
                                            describeParameterEncryptionDataReader: describeParameterEncryptionDataReader);
                 }
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             catch (Exception e)
             {
                 if (CachedAsyncState != null)
@@ -4827,6 +4838,7 @@ internal SqlDataReader RunExecuteReader(
             {
                 return RunExecuteReaderTds(cmdBehavior, runBehavior, returnStream, isAsync, timeout, out task, asyncWrite && isAsync, isRetry: isRetry);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
 
 
@@ -5422,6 +5434,7 @@ private void ValidateCommand(bool isAsync, [CallerMemberName] string method = ""
             // close any non MARS dead readers, if applicable, and then throw if still busy.
             // Throw if we have a live reader on this command
             _activeConnection.ValidateConnectionForExecute(method, this);
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
 
             // Check to see if the currently set transaction has completed.  If so,
             // null out our local reference.
@@ -5515,6 +5528,7 @@ private void GetStateObject(TdsParser parser = null)
         private void ReliablePutStateObject()
         {
             PutStateObject();
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
 
         private void PutStateObject()
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs
@@ -1250,6 +1250,7 @@ public override void ChangeDatabase(string database)
                 statistics = SqlStatistics.StartTimer(Statistics);
                 InnerConnection.ChangeDatabase(database);
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             finally
             {
                 SqlStatistics.StopTimer(statistics);
@@ -1323,6 +1324,7 @@ public override void Close()
                         _statistics._closeTimestamp = ADP.TimerCurrent();
                     }
                 }
+                // @TODO: CER Exception Handling was removed here (see GH#3581)
                 finally
                 {
                     SqlStatistics.StopTimer(statistics);
@@ -1890,6 +1892,7 @@ private bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)
                 tdsInnerConnection.Parser.Statistics = null;
                 _statistics = null; // in case of previous Open/Close/reset_CollectStats sequence
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
 
             return true;
         }
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
@@ -580,6 +580,7 @@ internal SqlInternalConnectionTds(
                     }
                 }
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             finally
             {
                 ThreadHasParserLockForClose = false;
@@ -2183,6 +2184,7 @@ internal bool GetSessionAndReconnectIfNeeded(SqlConnection parent, int timeout =
                     return true;
                 }
                 return false;
+                // @TODO: CER Exception Handling was removed here (see GH#3581)
             }
             finally
             {
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -4750,6 +4750,7 @@ internal void DrainData(TdsParserStateObject stateObj)
                 _connHandler.DoomThisConnection();
                 throw;
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
 
 
@@ -10382,6 +10383,7 @@ private void FinalizeExecuteRPC(TdsParserStateObject stateObj)
         private void TdsExecuteRPC_OnFailure(Exception exc, TdsParserStateObject stateObj)
         {
             FailureCleanup(stateObj, exc);
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
 
         private void ExecuteFlushTaskCallback(Task tsk, TdsParserStateObject stateObj, TaskCompletionSource<object> completion, bool releaseConnectionLock)
@@ -10396,6 +10398,7 @@ private void ExecuteFlushTaskCallback(Task tsk, TdsParserStateObject stateObj, T
                     {
                         FailureCleanup(stateObj, tsk.Exception);
                     }
+                    // @TODO: CER Exception Handling was removed here (see GH#3581)
                     catch (Exception e)
                     {
                         exc = e;
@@ -12085,6 +12088,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
                 }
 
                 return task ?? Task.CompletedTask;
+                // @TODO: CER Exception Handling was removed here (see GH#3581)
             }
 
             internal static void ValidateWriteParameters(byte[] buffer, int offset, int count)
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.netfx.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.netfx.cs
@@ -67,6 +67,7 @@ internal void AssignPendingDNSInfo(string userProtocol, string DNSCacheKey)
         internal bool RunReliably(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj)
         {
             return Run(runBehavior, cmdHandler, dataStream, bulkCopyHandler, stateObj);
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
         }
     }
 }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ConnectionPool/WaitHandleDbConnectionPool.cs
@@ -1072,6 +1072,7 @@ private void WaitForPendingOpen()
                                 next.UserOptions,
                                 out connection);
                         }
+                        // @TODO: CER Exception Handling was removed here (see GH#3581)
                         catch (Exception e)
                         {
                             caughtException = e;
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBulkCopy.cs
@@ -2101,6 +2101,7 @@ private Task WriteRowSourceToServerAsync(int columnCount, CancellationToken ctok
                 }
                 return null;
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             finally
             {
                 _columnMappings.ReadOnly = false;
@@ -2777,6 +2778,7 @@ private void CopyBatchesAsyncContinuedOnError(bool cleanupParser)
             {
                 CleanUpStateObject();
             }
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
 
             AbortTransaction();
         }
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommandBuilder.cs
@@ -255,6 +255,7 @@ public static void DeriveParameters(SqlCommand command)
                 throw ADP.ArgumentNull(nameof(command));
             }
 
+            // @TODO: CER Exception Handling was removed here (see GH#3581)
             command.DeriveParameters();
         }
 
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReader.cs
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalConnection.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalConnection.cs
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlTransaction.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlTransaction.cs
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs

Original file line number	Diff line number	Diff line change
`@@ -1411,6 +1411,7 @@ private void BeginExecuteNonQueryInternalReadStage(TaskCompletionSource<object>`
`1411`	`1411`	`CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteNonQuery), _activeConnection);`
`1412`	`1412`	`_stateObj.ReadSni(completion);`
`1413`	`1413`	`}`
	`1414`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1414`	`1415`	`catch (Exception)`
`1415`	`1416`	`{`
`1416`	`1417`	`// Similarly, if an exception occurs put the stateObj back into the pool.`
`@@ -1956,6 +1957,7 @@ private void BeginExecuteXmlReaderInternalReadStage(TaskCompletionSource<object>`
`1956`	`1957`	`CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteXmlReader), _activeConnection);`
`1957`	`1958`	`_stateObj.ReadSni(completion);`
`1958`	`1959`	`}`
	`1960`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1959`	`1961`	`catch (Exception e)`
`1960`	`1962`	`{`
`1961`	`1963`	`// Similarly, if an exception occurs put the stateObj back into the pool.`
`@@ -2607,6 +2609,7 @@ private void BeginExecuteReaderInternalReadStage(TaskCompletionSource<object> co`
`2607`	`2609`	`CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteReader), _activeConnection);`
`2608`	`2610`	`_stateObj.ReadSni(completion);`
`2609`	`2611`	`}`
	`2612`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`2610`	`2613`	`catch (Exception e)`
`2611`	`2614`	`{`
`2612`	`2615`	`// Similarly, if an exception occurs put the stateObj back into the pool.`
Original file line number	Diff line number	Diff line change
`@@ -1243,6 +1243,7 @@ public override void ChangeDatabase(string database)`
`1243`	`1243`	`statistics = SqlStatistics.StartTimer(Statistics);`
`1244`	`1244`	`InnerConnection.ChangeDatabase(database);`
`1245`	`1245`	`}`
	`1246`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1246`	`1247`	`finally`
`1247`	`1248`	`{`
`1248`	`1249`	`SqlStatistics.StopTimer(statistics);`
`@@ -1334,6 +1335,7 @@ public override void Close()`
`1334`	`1335`	`_statistics._closeTimestamp = ADP.TimerCurrent();`
`1335`	`1336`	`}`
`1336`	`1337`	`}`
	`1338`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1337`	`1339`	`catch (Exception ex)`
`1338`	`1340`	`{`
`1339`	`1341`	`e = ex;`
Original file line number	Diff line number	Diff line change
`@@ -570,6 +570,7 @@ internal SqlInternalConnectionTds(`
`570`	`570`	`}`
`571`	`571`	`}`
`572`	`572`	`}`
	`573`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`573`	`574`	`finally`
`574`	`575`	`{`
`575`	`576`	`ThreadHasParserLockForClose = false;`
`@@ -2130,6 +2131,7 @@ internal bool GetSessionAndReconnectIfNeeded(SqlConnection parent, int timeout =`
`2130`	`2131`	`return true;`
`2131`	`2132`	`}`
`2132`	`2133`	`return false;`
	`2134`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`2133`	`2135`	`}`
`2134`	`2136`	`finally`
`2135`	`2137`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4716,6 +4716,7 @@ internal void DrainData(TdsParserStateObject stateObj)`
`4716`	`4716`	`}`
`4717`	`4717`	`Run(RunBehavior.Clean, null, null, null, stateObj);`
`4718`	`4718`	`}`
	`4719`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`4719`	`4720`	`catch`
`4720`	`4721`	`{`
`4721`	`4722`	`_connHandler.DoomThisConnection();`
`@@ -10213,6 +10214,7 @@ private void FinalizeExecuteRPC(TdsParserStateObject stateObj)`
`10213`	`10214`	`private void TdsExecuteRPC_OnFailure(Exception exc, TdsParserStateObject stateObj)`
`10214`	`10215`	`{`
`10215`	`10216`	`FailureCleanup(stateObj, exc);`
	`10217`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`10216`	`10218`	`}`
`10217`	`10219`
`10218`	`10220`	`private void ExecuteFlushTaskCallback(Task tsk, TdsParserStateObject stateObj, TaskCompletionSource<object> completion, bool releaseConnectionLock)`
`@@ -10228,6 +10230,7 @@ private void ExecuteFlushTaskCallback(Task tsk, TdsParserStateObject stateObj, T`
`10228`	`10230`	`{`
`10229`	`10231`	`FailureCleanup(stateObj, tsk.Exception);`
`10230`	`10232`	`}`
	`10233`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`10231`	`10234`	`catch (Exception e)`
`10232`	`10235`	`{`
`10233`	`10236`	`exc = e;`
`@@ -11923,6 +11926,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati`
`11923`	`11926`	`}`
`11924`	`11927`
`11925`	`11928`	`return task ?? Task.CompletedTask;`
	`11929`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`11926`	`11930`	`}`
`11927`	`11931`
`11928`	`11932`	`internal static void ValidateWriteParameters(byte[] buffer, int offset, int count)`
Original file line number	Diff line number	Diff line change
`@@ -515,6 +515,7 @@ private SqlCommand(SqlCommand from) : this()`
`515`	`515`	`// cleanup`
`516`	`516`	`Unprepare();`
`517`	`517`	`}`
	`518`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`518`	`519`	`catch (Exception)`
`519`	`520`	`{`
`520`	`521`	`// we do not really care about errors in unprepare (may be the old connection went bad)`
`@@ -952,6 +953,7 @@ public override void Prepare()`
`952`	`953`
`953`	`954`	`InternalPrepare();`
`954`	`955`	`}`
	`956`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`955`	`957`	`catch (Exception e)`
`956`	`958`	`{`
`957`	`959`	`processFinallyBlock = ADP.IsCatchableExceptionType(e);`
`@@ -1107,6 +1109,7 @@ public override void Cancel()`
`1107`	`1109`	`}`
`1108`	`1110`	`}`
`1109`	`1111`	`}`
	`1112`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1110`	`1113`	`}`
`1111`	`1114`	`}`
`1112`	`1115`	`finally`
`@@ -1420,6 +1423,7 @@ private void BeginExecuteNonQueryInternalReadStage(TaskCompletionSource<object>`
`1420`	`1423`	`CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteNonQuery), _activeConnection);`
`1421`	`1424`	`_stateObj.ReadSni(completion);`
`1422`	`1425`	`}`
	`1426`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1423`	`1427`	`catch (Exception)`
`1424`	`1428`	`{`
`1425`	`1429`	`// Similarly, if an exception occurs put the stateObj back into the pool.`
`@@ -1693,6 +1697,7 @@ private object InternalEndExecuteNonQuery(`
`1693`	`1697`
`1694`	`1698`	`Debug.Assert(_stateObj == null, "non-null state object in EndExecuteNonQuery");`
`1695`	`1699`	`return _rowsAffected;`
	`1700`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1696`	`1701`	`}`
`1697`	`1702`
`1698`	`1703`	`private Task InternalExecuteNonQuery(`
`@@ -1776,6 +1781,7 @@ private Task InternalExecuteNonQuery(`
`1776`	`1781`	`}`
`1777`	`1782`	`Debug.Assert(isAsync \|\| _stateObj == null, "non-null state object in InternalExecuteNonQuery");`
`1778`	`1783`	`return task;`
	`1784`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1779`	`1785`	`}`
`1780`	`1786`
`1781`	`1787`	`/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/ExecuteXmlReader/*'/>`
`@@ -1954,6 +1960,7 @@ private void BeginExecuteXmlReaderInternalReadStage(TaskCompletionSource<object>`
`1954`	`1960`	`CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteXmlReader), _activeConnection);`
`1955`	`1961`	`_stateObj.ReadSni(completion);`
`1956`	`1962`	`}`
	`1963`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1957`	`1964`	`catch (Exception e)`
`1958`	`1965`	`{`
`1959`	`1966`	`// Similarly, if an exception occurs put the stateObj back into the pool.`
`@@ -2160,6 +2167,7 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)`
`2160`	`2167`	`sqlExceptionNumber = e.Number;`
`2161`	`2168`	`throw;`
`2162`	`2169`	`}`
	`2170`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`2163`	`2171`	`finally`
`2164`	`2172`	`{`
`2165`	`2173`	`SqlStatistics.StopTimer(statistics);`
`@@ -2572,6 +2580,7 @@ private void BeginExecuteReaderInternalReadStage(TaskCompletionSource<object> co`
`2572`	`2580`	`CachedAsyncState.SetActiveConnectionAndResult(completion, nameof(EndExecuteReader), _activeConnection);`
`2573`	`2581`	`_stateObj.ReadSni(completion);`
`2574`	`2582`	`}`
	`2583`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`2575`	`2584`	`catch (Exception e)`
`2576`	`2585`	`{`
`2577`	`2586`	`// Similarly, if an exception occurs put the stateObj back into the pool.`
`@@ -2602,6 +2611,7 @@ private SqlDataReader InternalEndExecuteReader(IAsyncResult asyncResult, bool is`
`2602`	`2611`	`SqlDataReader reader = CompleteAsyncExecuteReader(isInternal);`
`2603`	`2612`	`Debug.Assert(_stateObj == null, "non-null state object in InternalEndExecuteReader");`
`2604`	`2613`	`return reader;`
	`2614`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`2605`	`2615`	`}`
`2606`	`2616`
`2607`	`2617`	`/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml' path='docs/members[@name="SqlCommand"]/ExecuteNonQueryAsync[@name="CancellationToken"]/*'/>`
`@@ -4017,6 +4027,7 @@ private void PrepareForTransparentEncryption(`
`4017`	`4027`	`describeParameterEncryptionDataReader: describeParameterEncryptionDataReader);`
`4018`	`4028`	`}`
`4019`	`4029`	`}`
	`4030`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`4020`	`4031`	`catch (Exception e)`
`4021`	`4032`	`{`
`4022`	`4033`	`if (CachedAsyncState != null)`
`@@ -4827,6 +4838,7 @@ internal SqlDataReader RunExecuteReader(`
`4827`	`4838`	`{`
`4828`	`4839`	`return RunExecuteReaderTds(cmdBehavior, runBehavior, returnStream, isAsync, timeout, out task, asyncWrite && isAsync, isRetry: isRetry);`
`4829`	`4840`	`}`
	`4841`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`4830`	`4842`	`}`
`4831`	`4843`
`4832`	`4844`
`@@ -5422,6 +5434,7 @@ private void ValidateCommand(bool isAsync, [CallerMemberName] string method = ""`
`5422`	`5434`	`// close any non MARS dead readers, if applicable, and then throw if still busy.`
`5423`	`5435`	`// Throw if we have a live reader on this command`
`5424`	`5436`	`_activeConnection.ValidateConnectionForExecute(method, this);`
	`5437`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`5425`	`5438`
`5426`	`5439`	`// Check to see if the currently set transaction has completed. If so,`
`5427`	`5440`	`// null out our local reference.`
`@@ -5515,6 +5528,7 @@ private void GetStateObject(TdsParser parser = null)`
`5515`	`5528`	`private void ReliablePutStateObject()`
`5516`	`5529`	`{`
`5517`	`5530`	`PutStateObject();`
	`5531`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`5518`	`5532`	`}`
`5519`	`5533`
`5520`	`5534`	`private void PutStateObject()`
Original file line number	Diff line number	Diff line change
`@@ -1250,6 +1250,7 @@ public override void ChangeDatabase(string database)`
`1250`	`1250`	`statistics = SqlStatistics.StartTimer(Statistics);`
`1251`	`1251`	`InnerConnection.ChangeDatabase(database);`
`1252`	`1252`	`}`
	`1253`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1253`	`1254`	`finally`
`1254`	`1255`	`{`
`1255`	`1256`	`SqlStatistics.StopTimer(statistics);`
`@@ -1323,6 +1324,7 @@ public override void Close()`
`1323`	`1324`	`_statistics._closeTimestamp = ADP.TimerCurrent();`
`1324`	`1325`	`}`
`1325`	`1326`	`}`
	`1327`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1326`	`1328`	`finally`
`1327`	`1329`	`{`
`1328`	`1330`	`SqlStatistics.StopTimer(statistics);`
`@@ -1890,6 +1892,7 @@ private bool TryOpenInner(TaskCompletionSource<DbConnectionInternal> retry)`
`1890`	`1892`	`tdsInnerConnection.Parser.Statistics = null;`
`1891`	`1893`	`_statistics = null; // in case of previous Open/Close/reset_CollectStats sequence`
`1892`	`1894`	`}`
	`1895`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1893`	`1896`
`1894`	`1897`	`return true;`
`1895`	`1898`	`}`
Original file line number	Diff line number	Diff line change
`@@ -580,6 +580,7 @@ internal SqlInternalConnectionTds(`
`580`	`580`	`}`
`581`	`581`	`}`
`582`	`582`	`}`
	`583`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`583`	`584`	`finally`
`584`	`585`	`{`
`585`	`586`	`ThreadHasParserLockForClose = false;`
`@@ -2183,6 +2184,7 @@ internal bool GetSessionAndReconnectIfNeeded(SqlConnection parent, int timeout =`
`2183`	`2184`	`return true;`
`2184`	`2185`	`}`
`2185`	`2186`	`return false;`
	`2187`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`2186`	`2188`	`}`
`2187`	`2189`	`finally`
`2188`	`2190`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4750,6 +4750,7 @@ internal void DrainData(TdsParserStateObject stateObj)`
`4750`	`4750`	`_connHandler.DoomThisConnection();`
`4751`	`4751`	`throw;`
`4752`	`4752`	`}`
	`4753`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`4753`	`4754`	`}`
`4754`	`4755`
`4755`	`4756`
`@@ -10382,6 +10383,7 @@ private void FinalizeExecuteRPC(TdsParserStateObject stateObj)`
`10382`	`10383`	`private void TdsExecuteRPC_OnFailure(Exception exc, TdsParserStateObject stateObj)`
`10383`	`10384`	`{`
`10384`	`10385`	`FailureCleanup(stateObj, exc);`
	`10386`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`10385`	`10387`	`}`
`10386`	`10388`
`10387`	`10389`	`private void ExecuteFlushTaskCallback(Task tsk, TdsParserStateObject stateObj, TaskCompletionSource<object> completion, bool releaseConnectionLock)`
`@@ -10396,6 +10398,7 @@ private void ExecuteFlushTaskCallback(Task tsk, TdsParserStateObject stateObj, T`
`10396`	`10398`	`{`
`10397`	`10399`	`FailureCleanup(stateObj, tsk.Exception);`
`10398`	`10400`	`}`
	`10401`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`10399`	`10402`	`catch (Exception e)`
`10400`	`10403`	`{`
`10401`	`10404`	`exc = e;`
`@@ -12085,6 +12088,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati`
`12085`	`12088`	`}`
`12086`	`12089`
`12087`	`12090`	`return task ?? Task.CompletedTask;`
	`12091`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`12088`	`12092`	`}`
`12089`	`12093`
`12090`	`12094`	`internal static void ValidateWriteParameters(byte[] buffer, int offset, int count)`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ internal void AssignPendingDNSInfo(string userProtocol, string DNSCacheKey)`
`67`	`67`	`internal bool RunReliably(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj)`
`68`	`68`	`{`
`69`	`69`	`return Run(runBehavior, cmdHandler, dataStream, bulkCopyHandler, stateObj);`
	`70`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1072,6 +1072,7 @@ private void WaitForPendingOpen()`
`1072`	`1072`	`next.UserOptions,`
`1073`	`1073`	`out connection);`
`1074`	`1074`	`}`
	`1075`	`+ // @TODO: CER Exception Handling was removed here (see GH#3581)`
`1075`	`1076`	`catch (Exception e)`
`1076`	`1077`	`{`
`1077`	`1078`	`caughtException = e;`