Skip to content

Commit 1b244ad

Browse files
committed
Call EnsureIsNotDisposed method in the new async methods of SqlConnection
1 parent d3a203b commit 1b244ad

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

Orm/Xtensive.Orm.Oracle/Sql.Drivers.Oracle/Connection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public override ICharacterLargeObject CreateCharacterLargeObject()
5656
public override void BeginTransaction()
5757
{
5858
EnsureIsNotDisposed();
59-
EnsureTransactionIsNotActive();
59+
EnsureTransactionIsNotActive();
6060
activeTransaction = underlyingConnection.BeginTransaction();
6161
}
6262

Orm/Xtensive.Orm/Sql/SqlConnection.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ public virtual void Open()
175175
/// <param name="initializationScript">Initialization script.</param>
176176
public virtual void OpenAndInitialize(string initializationScript)
177177
{
178+
EnsureIsNotDisposed();
178179
UnderlyingConnection.Open();
179180
if (string.IsNullOrEmpty(initializationScript)) {
180181
return;
@@ -193,6 +194,7 @@ public virtual void OpenAndInitialize(string initializationScript)
193194
public virtual Task OpenAsync(CancellationToken cancellationToken)
194195
{
195196
cancellationToken.ThrowIfCancellationRequested();
197+
EnsureIsNotDisposed();
196198
return UnderlyingConnection.OpenAsync(cancellationToken);
197199
}
198200

@@ -205,6 +207,7 @@ public virtual Task OpenAsync(CancellationToken cancellationToken)
205207
public virtual async Task OpenAndInitializeAsync(string initializationScript, CancellationToken token = default)
206208
{
207209
token.ThrowIfCancellationRequested();
210+
EnsureIsNotDisposed();
208211
await UnderlyingConnection.OpenAsync(token).ConfigureAwait(false);
209212
if (string.IsNullOrEmpty(initializationScript)) {
210213
return;
@@ -238,7 +241,7 @@ public virtual void Close()
238241
public virtual Task CloseAsync()
239242
{
240243
EnsureIsNotDisposed();
241-
await UnderlyingConnection.CloseAsync();
244+
return UnderlyingConnection.CloseAsync();
242245
}
243246

244247
/// <summary>

0 commit comments

Comments
 (0)