Reverting session factory changes

This commit is contained in:
Sebastien Ros 2015-08-26 16:40:02 -07:00
parent 3d63c6d333
commit 96f6cb36fd

View File

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