[Nhibernate-commit] SF.net SVN: nhibernate:[4772] branches/2.1.x/nhibernate/src/NHibernate/Impl

[<aye...@us...>]

Revision: 4772
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4772&view=rev
Author:   ayenderahien
Date:     2009-10-18 01:21:02 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
Merging r4770
Making sure that child sessions share the same session id as their parent (allow correlation)

Modified Paths:
--------------
    branches/2.1.x/nhibernate/src/NHibernate/Impl/AbstractSessionImpl.cs
    branches/2.1.x/nhibernate/src/NHibernate/Impl/SessionImpl.cs

Modified: branches/2.1.x/nhibernate/src/NHibernate/Impl/AbstractSessionImpl.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Impl/AbstractSessionImpl.cs	2009-10-18 01:14:34 UTC (rev 4771)
+++ branches/2.1.x/nhibernate/src/NHibernate/Impl/AbstractSessionImpl.cs	2009-10-18 01:21:02 UTC (rev 4772)
@@ -50,6 +50,12 @@
 			this.factory = factory;
 		}
 
+		protected internal AbstractSessionImpl(ISessionFactoryImplementor factory, Guid sessionId)
+			: this(factory)
+		{
+			this.sessionId = sessionId;
+		}
+
 		#region ISessionImplementor Members
 
 		public void Initialize()

Modified: branches/2.1.x/nhibernate/src/NHibernate/Impl/SessionImpl.cs
===================================================================
--- branches/2.1.x/nhibernate/src/NHibernate/Impl/SessionImpl.cs	2009-10-18 01:14:34 UTC (rev 4771)
+++ branches/2.1.x/nhibernate/src/NHibernate/Impl/SessionImpl.cs	2009-10-18 01:21:02 UTC (rev 4772)
@@ -240,7 +240,7 @@
 		/// <param name="parent">The parent Session</param>
 		/// <param name="entityMode">The entity mode</param>
 		private SessionImpl(SessionImpl parent, EntityMode entityMode)
-			: base(parent.Factory)
+			: base(parent.Factory, parent.SessionId)
 		{
 			using (new SessionIdLoggingContext(SessionId))
 			{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.