Moving all nhibernate session management logic to a NHibernateActionF…

…ilter

CourseSampleApp/Controllers/SessionController.cs

@@ -1,5 +1,6 @@
 using System.Web;
 using System.Web.Mvc;
+using CourseSampleApp.Infrastructure;
 using NHibernate;
 
 namespace CourseSampleApp.Controllers
@@ -8,12 +9,9 @@ public class SessionController : Controller
 	{
 		public HttpSessionStateBase HttpSession
 		{
-			get { return base.Session;  }
+			get { return base.Session; }
 		}
 
-		public new ISession Session
-		{
-			get { return MvcApplication.CurrentSession; }
-		}
+		public new ISession Session { get { return NHibernateActionFilter.CurrentSession; } }
 	}
 }

CourseSampleApp/CourseSampleApp.csproj

@@ -82,6 +82,7 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="Infrastructure\NHibernateActionFilter.cs" />
     <Compile Include="Models\Blog.cs" />
     <Compile Include="Models\User.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

CourseSampleApp/Global.asax.cs

@@ -4,6 +4,7 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
+using CourseSampleApp.Infrastructure;
 using NHibernate;
 using NHibernate.Cfg;
 
@@ -14,33 +15,10 @@ namespace CourseSampleApp
 
 	public class MvcApplication : System.Web.HttpApplication
 	{
-		private static readonly ISessionFactory sessionFactory = BuildSessionFactory();
-
-		public static ISession CurrentSession
-		{
-			get{ return HttpContext.Current.Items["NHibernateSession"] as ISession;}
-			set { HttpContext.Current.Items["NHibernateSession"] = value; }
-		}
-
-		public MvcApplication()
-		{
-			BeginRequest += (sender, args) =>
-			{
-				CurrentSession = sessionFactory.OpenSession();
-			};
-			EndRequest += (o, eventArgs) =>
-			{
-				var session = CurrentSession;
-				if (session != null)
-				{
-					session.Dispose();
-				}
-			};
-		}
-
 		public static void RegisterGlobalFilters(GlobalFilterCollection filters)
 		{
 			filters.Add(new HandleErrorAttribute());
+			filters.Add(new NHibernateActionFilter());
 		}
 
 		public static void RegisterRoutes(RouteCollection routes)
@@ -62,12 +40,5 @@ protected void Application_Start()
 			RegisterGlobalFilters(GlobalFilters.Filters);
 			RegisterRoutes(RouteTable.Routes);
 		}
-
-		private static ISessionFactory BuildSessionFactory()
-		{
-			return new Configuration()
-				.Configure()
-				.BuildSessionFactory();
-		}
 	}
 }

CourseSampleApp/Infrastructure/NHibernateActionFilter.cs

@@ -0,0 +1,41 @@
+using System.Web;
+using System.Web.Mvc;
+using CourseSampleApp.Controllers;
+using NHibernate;
+using NHibernate.Cfg;
+
+namespace CourseSampleApp.Infrastructure
+{
+	public class NHibernateActionFilter : ActionFilterAttribute
+	{
+		private static readonly ISessionFactory sessionFactory = BuildSessionFactory();
+
+		public static ISession CurrentSession
+		{
+			get { return HttpContext.Current.Items["NHibernateSession"] as ISession; }
+			set { HttpContext.Current.Items["NHibernateSession"] = value; }
+		}
+
+		private static ISessionFactory BuildSessionFactory()
+		{
+			return new Configuration()
+				.Configure()
+				.BuildSessionFactory();
+		}
+
+		public override void OnActionExecuting(ActionExecutingContext filterContext)
+		{
+			CurrentSession = sessionFactory.OpenSession();
+		}
+
+		public override void OnActionExecuted(ActionExecutedContext filterContext)
+		{
+
+			var session = CurrentSession;
+			if (session != null)
+			{
+				session.Dispose();
+			}
+		}
+	}
+}