- Minor Test added for ThreadStaticSessionContext as Ignored.

- Preparing AutoClose Session.

SVN: trunk@3332

Author: darioquintana

src/NHibernate.Test/ConnectionTest/ThreadLocalCurrentSessionTest.cs

@@ -0,0 +1,92 @@
+using NHibernate.Cfg;
+using NHibernate.Context;
+using NHibernate.Engine;
+using NUnit.Framework;
+
+namespace NHibernate.Test.ConnectionTest
+{
+	[TestFixture,Ignore("Not yet supported, need a better or diferent treatment at transactions. Need AutoClosed feature.")]
+	public class ThreadLocalCurrentSessionTest : ConnectionManagementTestCase
+	{
+		protected override ISession GetSessionUnderTest()
+		{
+			ISession session = OpenSession();
+			session.BeginTransaction();
+			return session;
+		}
+
+		protected override void Configure(Configuration configuration)
+		{
+			base.Configure(cfg);
+			cfg.SetProperty(Environment.CurrentSessionContextClass, typeof (TestableThreadStaticContext).AssemblyQualifiedName);
+			cfg.SetProperty(Environment.GenerateStatistics, "true");
+		}
+
+		protected override void Release(ISession session)
+		{
+			long initialCount = sessions.Statistics.SessionCloseCount;
+			session.Transaction.Commit();
+			long subsequentCount = sessions.Statistics.SessionCloseCount;
+			Assert.AreEqual(initialCount + 1, subsequentCount, "Session still open after commit");
+			// also make sure it was cleaned up from the internal ThreadLocal...
+			Assert.IsFalse(TestableThreadStaticContext.HasBind(), "session still bound to internal ThreadLocal");
+		}
+
+		//TODO: Need AutoCloseEnabled feature after commit.
+		[Test]
+		public void ContextCleanup()
+		{
+			ISession session = OpenSession();
+			
+			session.BeginTransaction();
+			session.Transaction.Commit();
+			Assert.IsFalse(session.IsOpen, "session open after txn completion");
+			Assert.IsFalse(TestableThreadStaticContext.IsSessionBound(session), "session still bound after txn completion");
+			
+			ISession session2 = OpenSession();
+			Assert.IsFalse(session.Equals(session2), "same session returned after txn completion");
+			session2.Close();
+			Assert.IsFalse(session2.IsOpen, "session open after closing");
+			Assert.IsFalse(TestableThreadStaticContext.IsSessionBound(session2), "session still bound after closing");
+		}
+
+		[Test]
+		public void TransactionProtection()
+		{
+			using (ISession session = OpenSession())
+			{
+				try
+				{
+					session.CreateQuery("from Silly");
+					Assert.Fail("method other than beginTransaction{} allowed");
+				}
+				catch (HibernateException e)
+				{
+					// ok
+				}
+			}
+		}
+	}
+
+	public class TestableThreadStaticContext : ThreadStaticSessionContext
+	{
+		private static TestableThreadStaticContext me;
+
+		public TestableThreadStaticContext(ISessionFactoryImplementor factory)
+			: base(factory)
+		{
+			me = this;
+		}
+
+		public static bool IsSessionBound(ISession session)
+		{
+			return context != null && context.ContainsKey(me.factory)
+			       && context[me.factory] == session;
+		}
+
+		public static bool HasBind()
+		{
+			return context != null && context.ContainsKey(me.factory);
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test-2.0.csproj

@@ -100,6 +100,7 @@
     <Compile Include="ConnectionTest\ConnectionManagementTestCase.cs" />
     <Compile Include="ConnectionTest\Other.cs" />
     <Compile Include="ConnectionTest\Silly.cs" />
+    <Compile Include="ConnectionTest\ThreadLocalCurrentSessionTest.cs" />
     <Compile Include="Criteria\AddNumberProjection.cs" />
     <Compile Include="Criteria\Animal.cs" />
     <Compile Include="Criteria\Course.cs" />

src/NHibernate/Context/ThreadStaticSessionContext.cs

@@ -32,7 +32,7 @@ public class ThreadStaticSessionContext : ICurrentSessionContext
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof (ThreadStaticSessionContext));
 
-		[ThreadStatic] private static IDictionary<ISessionFactory, ISession> context;
+		[ThreadStatic] protected static IDictionary<ISessionFactory, ISession> context;
 
 		protected readonly ISessionFactoryImplementor factory;
 
@@ -49,7 +49,7 @@ public ISession CurrentSession()
 			ISession current = ExistingSession(factory);
 			if (current == null)
 			{
-				current = buildOrObtainSession();
+				current = BuildOrObtainSession();
 
 				// wrap the session in the transaction-protection proxy
 				if (NeedsWrapping(current))
@@ -146,7 +146,7 @@ private bool NeedsWrapping(ISession current)
 			return false;
 		}
 
-		protected ISession buildOrObtainSession()
+		protected ISession BuildOrObtainSession()
 		{
 			return factory.OpenSession(
 				null,

src/NHibernate/Impl/SessionImpl.cs

@@ -73,6 +73,11 @@ public sealed class SessionImpl : AbstractSessionImpl, IEventSource, ISerializab
 		[NonSerialized]
 		private IDictionary<EntityMode,ISession> childSessionsByEntityMode;
 
+
+		//[NonSerialized] private bool flushBeforeCompletionEnabled;
+		[NonSerialized] private bool autoCloseSessionEnabled;
+		//[NonSerialized] private ConnectionReleaseMode connectionReleaseMode;
+
 		#region System.Runtime.Serialization.ISerializable Members
 
 		/// <summary>
@@ -222,7 +227,7 @@ public SessionImpl(
 			this.actionQueue = new ActionQueue(this);
 			this.persistenceContext = new StatefulPersistenceContext(this);
 			//this.flushBeforeCompletionEnabled = flushBeforeCompletionEnabled;
-			//this.autoCloseSessionEnabled = autoCloseSessionEnabled;
+			this.autoCloseSessionEnabled = autoCloseSessionEnabled;
 			//this.connectionReleaseMode = connectionReleaseMode;
 			//this.jdbcContext = new JDBCContext(this, connection, interceptor);
 		}
@@ -244,7 +249,7 @@ private SessionImpl(SessionImpl parent, EntityMode entityMode)
 			this.entityMode = entityMode;
 			this.persistenceContext = new StatefulPersistenceContext(this);
 			//this.flushBeforeCompletionEnabled = false;
-			//this.autoCloseSessionEnabled = false;
+			this.autoCloseSessionEnabled = false;
 			//this.connectionReleaseMode = null;
 
 			if (factory.Statistics.IsStatisticsEnabled)
@@ -269,6 +274,16 @@ public override long Timestamp
 			get { return timestamp; }
 		}
 
+		public bool IsAutoCloseSessionEnabled
+		{
+			get { return autoCloseSessionEnabled; }
+		}
+
+		public bool ShouldAutoClose
+		{
+			get { return IsAutoCloseSessionEnabled && !IsClosed; }
+		}
+
 		/// <summary></summary>
 		public IDbConnection Close()
 		{

src/NHibernate/Transaction/AdoTransaction.cs

@@ -164,7 +164,7 @@ public void Commit()
 			}
 
 			session.BeforeTransactionCompletion(this);
-
+			
 			try
 			{
 				trans.Commit();
@@ -267,6 +267,16 @@ public IsolationLevel IsolationLevel
 			get { return trans.IsolationLevel; }
 		}
 
+		void CloseIfRequerid()
+		{
+			//bool close = session.ShouldAutoClose() &&
+			//    !transactionContext.isClosed();
+			//if (close)
+			//{
+			//    transactionContext.managedClose();
+			//}
+		}
+
 		#region System.IDisposable Members
 
 		/// <summary>