NH-3402 - Refactor ThreadLocalSessionContext

src/NHibernate/Context/ThreadLocalSessionContext.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 
 using NHibernate;
 using NHibernate.Engine;
@@ -19,165 +20,21 @@ namespace NHibernate.Context
 	/// generated here are unusable until after {@link Session#beginTransaction()}
 	/// has been called. If <tt>Close()</tt> is called on a session managed by
 	/// this class, it will be automatically unbound.
-	/// <p/>
-	/// Additionally, the static <see cref="Bind"/> and <see cref="Unbind"/> methods are
-	/// provided to allow application code to explicitly control opening and
-	/// closing of these sessions.  This, with some from of interception,
-	/// is the preferred approach.  It also allows easy framework integration
-	/// and one possible approach for implementing long-sessions.
-	/// <p/>
 	/// </summary>
 	[Serializable]
-	public class ThreadLocalSessionContext : ICurrentSessionContext
+	public class ThreadLocalSessionContext : CurrentSessionContext
 	{
-		private static readonly IInternalLogger log = LoggerProvider.LoggerFor(typeof(ThreadLocalSessionContext));
+		private ThreadLocal<ISession> _session = new ThreadLocal<ISession>();
 
-		[ThreadStatic]
-		protected static IDictionary<ISessionFactory, ISession> context;
-
-		protected readonly ISessionFactoryImplementor factory;
-
-
-		public ThreadLocalSessionContext(ISessionFactoryImplementor factory)
-		{
-			this.factory = factory;
-		}
-
-		#region ICurrentSessionContext Members
-
-		public ISession CurrentSession()
-		{
-			ISession current = ExistingSession(factory);
-			if (current == null)
-			{
-				current = BuildOrObtainSession();
-
-				// wrap the session in the transaction-protection proxy
-				if (NeedsWrapping(current))
-				{
-					current = Wrap(current);
-				}
-				// then bind it
-				DoBind(current, factory);
-			}
-			return current;
-		}
-
-		#endregion
-
-		private static void CleanupAnyOrphanedSession(ISessionFactory factory)
-		{
-			ISession orphan = DoUnbind(factory, false);
-
-			if (orphan != null)
-			{
-				log.Warn("Already session bound on call to bind(); make sure you clean up your sessions!");
-
-				try
-				{
-					if (orphan.Transaction != null && orphan.Transaction.IsActive)
-					{
-						try
-						{
-							orphan.Transaction.Rollback();
-						}
-						catch (Exception ex)
-						{
-							log.Debug("Unable to rollback transaction for orphaned session", ex);
-						}
-					}
-					orphan.Close();
-				}
-				catch (Exception ex)
-				{
-					log.Debug("Unable to close orphaned session", ex);
-				}
-			}
-		}
-
-		public static void Bind(ISession session)
-		{
-			ISessionFactory factory = session.SessionFactory;
-			CleanupAnyOrphanedSession(factory);
-			DoBind(session, factory);
-		}
-
-		/// <summary>
-		/// Unassociate a previously bound session from the current thread of execution.
-		/// </summary>
-		/// <param name="factory"></param>
-		/// <returns></returns>
-		public static ISession Unbind(ISessionFactory factory)
-		{
-			return DoUnbind(factory, true);
-		}
-
-		private static void DoBind(ISession current, ISessionFactory factory)
-		{
-			context = context ?? new Dictionary<ISessionFactory, ISession>();
-
-			context.Add(factory, current);
-		}
-
-		private static ISession DoUnbind(ISessionFactory factory, bool releaseMapIfEmpty)
-		{
-			ISession session = null;
-
-			if (context != null)
-			{
-				if (context.TryGetValue(factory, out session))
-				{
-					context.Remove(factory);
-				}
-
-				if (releaseMapIfEmpty && context.Count == 0)
-					context = null;
-			}
-			return session;
-		}
-
-		private ISession Wrap(ISession current)
-		{
-			return current;
-		}
-
-		private bool NeedsWrapping(ISession current)
-		{
-			return false;
-		}
-
-		protected ISession BuildOrObtainSession()
-		{
-			return factory.OpenSession(
-				null,
-				IsAutoFlushEnabled(),
-				IsAutoCloseEnabled(),
-				GetConnectionReleaseMode());
-		}
-
-		private ConnectionReleaseMode GetConnectionReleaseMode()
-		{
-			return factory.Settings.ConnectionReleaseMode;
-		}
-
-		protected virtual bool IsAutoCloseEnabled()
-		{
-			return true;
-		}
-
-		protected virtual bool IsAutoFlushEnabled()
+		public ThreadLocalSessionContext(Engine.ISessionFactoryImplementor factory)
 		{
-			return true;
 		}
 
-		private static ISession ExistingSession(ISessionFactory factory)
+		/// <summary> Gets or sets the currently bound session. </summary>
+		protected override ISession Session
 		{
-			if (context == null)
-				return null;
-
-			ISession result;
-			context.TryGetValue(factory, out result);
-			return result;
+			get { return _session.Value; }
+			set { _session.Value = value; }
 		}
 	}
 }

src/NHibernate/Impl/SessionImpl.cs

@@ -19,6 +19,7 @@
 using NHibernate.Persister.Collection;
 using NHibernate.Persister.Entity;
 using NHibernate.Proxy;
+using NHibernate.Proxy.DynamicProxy;
 using NHibernate.Stat;
 using NHibernate.Type;
 using NHibernate.Util;
@@ -1059,6 +1060,11 @@ public override string GuessEntityName(object entity)
 		{
 			using (new SessionIdLoggingContext(SessionId))
 			{
+				//NH-3448 Fix GuessEntityName
+				if ((entity is IProxy) && (entity is IFieldInterceptorAccessor))
+				{
+					return (entity as IFieldInterceptorAccessor).FieldInterceptor.EntityName;
+				}
 				string entityName = interceptor.GetEntityName(entity);
 				if (entityName == null)
 				{

src/NHibernate/Linq/SqlMethods.cs

@@ -9,7 +9,7 @@ public static class SqlMethods
 		/// an SQL LIKE expression. (Any 2-argument method named Like in a class named SqlMethods
 		/// will be translated.)
 		/// </summary>
-		public static bool Like(string matchExpression, string pattern)
+		public static bool Like(this string matchExpression, string pattern)
 		{
 			throw new NotSupportedException(
 				"The NHibernate.Linq.SqlMethods.Like(string, string) method can only be used in Linq2NHibernate expressions.");

src/NHibernate/NHibernateUtil.cs

@@ -4,6 +4,7 @@
 using NHibernate.Impl;
 using NHibernate.Intercept;
 using NHibernate.Proxy;
+using NHibernate.Proxy.DynamicProxy;
 using NHibernate.Type;
 using NHibernate.UserTypes;
 using NHibernate.Util;
@@ -407,6 +408,11 @@ public static System.Type GetClass(object proxy)
 			{
 				return ((INHibernateProxy)proxy).HibernateLazyInitializer.GetImplementation().GetType();
 			}
+			//NH-3448 Fix GuessEntityName
+			else if ((proxy is IProxy) && (proxy is IFieldInterceptorAccessor))
+			{
+				return (proxy as IFieldInterceptorAccessor).FieldInterceptor.MappedClass;
+			}
 			else
 			{
 				return proxy.GetType();