lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing IContentManagerSession usage

Browse Source
This commit is contained in:
Sebastien Ros
2014-09-19 10:15:28 -07:00
parent ba9a812d87
commit 1824a738a9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,17 +15,18 @@ namespace Orchard.Data {
public class SessionLocator : ISessionLocator, ITransactionManager, IDisposable { public class SessionLocator : ISessionLocator, ITransactionManager, IDisposable {
private readonly ISessionFactoryHolder _sessionFactoryHolder; private readonly ISessionFactoryHolder _sessionFactoryHolder;
private readonly IEnumerable<ISessionInterceptor> _interceptors; private readonly IEnumerable<ISessionInterceptor> _interceptors;
private Func<IContentManagerSession> _contentManagerSession; private Func<IContentManagerSession> _contentManagerSessionFactory;
private ISession _session; private ISession _session;
private IContentManagerSession _contentManagerSession;
public SessionLocator( public SessionLocator(
ISessionFactoryHolder sessionFactoryHolder, ISessionFactoryHolder sessionFactoryHolder,
Func<IContentManagerSession> contentManagerSession, Func<IContentManagerSession> contentManagerSessionFactory,
IEnumerable<ISessionInterceptor> interceptors) { IEnumerable<ISessionInterceptor> interceptors) {
_sessionFactoryHolder = sessionFactoryHolder; _sessionFactoryHolder = sessionFactoryHolder;
_interceptors = interceptors; _interceptors = interceptors;
_contentManagerSession = contentManagerSession; _contentManagerSessionFactory = contentManagerSessionFactory;
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
IsolationLevel = IsolationLevel.ReadCommitted; IsolationLevel = IsolationLevel.ReadCommitted;
@@ -75,12 +76,12 @@ namespace Orchard.Data {
} }
} }
finally { finally {
_contentManagerSession.Clear();
Logger.Debug("Disposing session"); Logger.Debug("Disposing session");
_session.Close(); _session.Close();
_session.Dispose(); _session.Dispose();
_session = null; _session = null;
_contentManagerSession().Clear();
} }
} }
} }
@@ -94,6 +95,7 @@ namespace Orchard.Data {
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();
} }
class OrchardSessionInterceptor : IInterceptor { class OrchardSessionInterceptor : IInterceptor {