lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 17:51:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Disposing the session when a transaction is rolled back

Browse Source
This commit is contained in:
Sebastien Ros
2015-08-26 14:41:12 -07:00
parent 8d4cb98d59
commit 4cec35daf8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Orchard/Data/SessionLocator.cs
View File

@@ -30,9 +30,9 @@ namespace Orchard.Data {
} }
public class TransactionManager : ITransactionManager, IDisposable { public class TransactionManager : ITransactionManager, IDisposable {
private readonly ISessionFactoryHolder _sessionFactoryHolder;
private readonly IEnumerable<ISessionInterceptor> _interceptors; private readonly IEnumerable<ISessionInterceptor> _interceptors;
private Func<IContentManagerSession> _contentManagerSessionFactory; private Func<IContentManagerSession> _contentManagerSessionFactory;
private readonly ISessionFactory _sessionFactory;
private ISession _session; private ISession _session;
private IContentManagerSession _contentManagerSession; private IContentManagerSession _contentManagerSession;
@@ -41,9 +41,9 @@ namespace Orchard.Data {
ISessionFactoryHolder sessionFactoryHolder, ISessionFactoryHolder sessionFactoryHolder,
Func<IContentManagerSession> contentManagerSessionFactory, Func<IContentManagerSession> contentManagerSessionFactory,
IEnumerable<ISessionInterceptor> interceptors) { IEnumerable<ISessionInterceptor> interceptors) {
_sessionFactoryHolder = sessionFactoryHolder;
_interceptors = interceptors; _interceptors = interceptors;
_contentManagerSessionFactory = contentManagerSessionFactory; _contentManagerSessionFactory = contentManagerSessionFactory;
_sessionFactory = sessionFactoryHolder.GetSessionFactory();
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
IsolationLevel = IsolationLevel.ReadCommitted; IsolationLevel = IsolationLevel.ReadCommitted;
@@ -74,6 +74,7 @@ namespace Orchard.Data {
if (_session != null && _session.Transaction.IsActive) { if (_session != null && _session.Transaction.IsActive) {
Logger.Debug("Rolling back transaction"); Logger.Debug("Rolling back transaction");
_session.Transaction.Rollback(); _session.Transaction.Rollback();
DisposeSession();
} }
} }
@@ -106,10 +107,9 @@ namespace Orchard.Data {
if (_session != null) { if (_session != null) {
return; return;
} }
var sessionFactory = _sessionFactoryHolder.GetSessionFactory();
Logger.Debug("Opening NHibernate session"); Logger.Debug("Opening NHibernate session");
_session = sessionFactory.OpenSession(new OrchardSessionInterceptor(_interceptors.ToArray(), Logger)); _session = _sessionFactory.OpenSession(new OrchardSessionInterceptor(_interceptors.ToArray(), Logger));
_session.BeginTransaction(level); _session.BeginTransaction(level);
_contentManagerSession = _contentManagerSessionFactory(); _contentManagerSession = _contentManagerSessionFactory();
} }