Skip to content

Commit c18facb

Browse files
committed
Make fewer MySqlCommand operations invalid when disposed.
This increases conformance with other ADO.NET providers.
1 parent 757bb42 commit c18facb

File tree

1 file changed

+3
-28
lines changed

1 file changed

+3
-28
lines changed

src/MySqlConnector/MySql.Data.MySqlClient/MySqlCommand.cs

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,7 @@ private MySqlCommand(MySqlCommand other)
5656
m_parameterCollection = other.CloneRawParameters();
5757
}
5858

59-
public new MySqlParameterCollection Parameters
60-
{
61-
get
62-
{
63-
VerifyNotDisposed();
64-
return m_parameterCollection ??= new MySqlParameterCollection();
65-
}
66-
}
59+
public new MySqlParameterCollection Parameters => m_parameterCollection ??= new MySqlParameterCollection();
6760

6861
MySqlParameterCollection? IMySqlCommand.RawParameters => m_parameterCollection;
6962

@@ -210,11 +203,7 @@ protected override DbTransaction? DbTransaction
210203
set => Transaction = (MySqlTransaction?) value;
211204
}
212205

213-
protected override DbParameter CreateDbParameter()
214-
{
215-
VerifyNotDisposed();
216-
return new MySqlParameter();
217-
}
206+
protected override DbParameter CreateDbParameter() => new MySqlParameter();
218207

219208
protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
220209
{
@@ -283,16 +272,8 @@ internal Task<DbDataReader> ExecuteReaderAsync(CommandBehavior behavior, IOBehav
283272

284273
protected override void Dispose(bool disposing)
285274
{
286-
try
287-
{
288-
if (disposing)
289-
m_parameterCollection = null;
290-
}
291-
finally
292-
{
293-
base.Dispose(disposing);
294-
}
295275
m_isDisposed = true;
276+
base.Dispose(disposing);
296277
}
297278

298279
#if !NETSTANDARD2_1 && !NETCOREAPP3_0
@@ -329,12 +310,6 @@ public override ValueTask DisposeAsync()
329310

330311
private IOBehavior AsyncIOBehavior => Connection?.AsyncIOBehavior ?? IOBehavior.Asynchronous;
331312

332-
private void VerifyNotDisposed()
333-
{
334-
if (m_isDisposed)
335-
throw new ObjectDisposedException(GetType().Name);
336-
}
337-
338313
private bool IsValid([NotNullWhen(false)] out Exception? exception)
339314
{
340315
exception = null;

0 commit comments

Comments
 (0)