Skip to content

Refactoring: simplify OpenSessionAsync() code #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Refactoring: simplify OpenSessionAsync() code #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions Orm/Xtensive.Orm/Orm/Domain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,18 +315,8 @@ public Task<Session> OpenSessionAsync(SessionType type, CancellationToken cancel
public Task<Session> OpenSessionAsync(SessionConfiguration configuration, CancellationToken cancellationToken = default)
{
ArgumentNullException.ThrowIfNull(configuration);

SessionScope sessionScope = null;
try {
if (configuration.Supports(SessionOptions.AutoActivation)) {
sessionScope = new SessionScope();
}
return OpenSessionInternalAsync(configuration, null, sessionScope, cancellationToken);
}
catch {
sessionScope?.Dispose();
throw;
}
using SessionScope sessionScope = configuration.Supports(SessionOptions.AutoActivation) ? new() : null;
return OpenSessionInternalAsync(configuration, null, sessionScope, cancellationToken);
}

internal SessionConfiguration GetSessionConfiguration(SessionType type) =>
Expand Down
14 changes: 2 additions & 12 deletions Orm/Xtensive.Orm/Orm/StorageNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,8 @@ public Task<Session> OpenSessionAsync(SessionType type, CancellationToken cancel
public Task<Session> OpenSessionAsync(SessionConfiguration configuration, CancellationToken cancellationToken = default)
{
ArgumentNullException.ThrowIfNull(configuration);

SessionScope sessionScope = null;
try {
if (configuration.Supports(SessionOptions.AutoActivation)) {
sessionScope = new SessionScope();
}
return domain.OpenSessionInternalAsync(configuration, this, sessionScope, cancellationToken);
}
catch {
sessionScope?.Dispose();
throw;
}
using SessionScope sessionScope = configuration.Supports(SessionOptions.AutoActivation) ? new() : null;
return domain.OpenSessionInternalAsync(configuration, this, sessionScope, cancellationToken);
}

public void ClearSequenceCaches()
Expand Down
Loading