Merge tag '5.0.3'

Author: hazzik

build-common/NHibernate.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">2</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">3</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>

build-common/common.xml

@@ -30,8 +30,8 @@
 
 	<!-- This is used only for build folder -->
 	<!-- TODO: Either remove or refactor to use NHibernate.props -->
-	<property name="project.version" value="5.0.2" overwrite="false" />
-	<property name="project.version.numeric" value="5.0.2" overwrite="false" />
+	<property name="project.version" value="5.0.3" overwrite="false" />
+	<property name="project.version.numeric" value="5.0.3" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />

releasenotes.txt

@@ -1,4 +1,12 @@
-Build 5.0.2
+Build 5.0.3
+=============================
+
+Release notes - NHibernate - Version 5.0.3
+
+** Bug
+    * #1462 Fix disposing SessionIdLoggingContext if CheckAndUpdateSessionStatus is failed
+
+Build 5.0.2
 =============================
 
 Release notes - NHibernate - Version 5.0.2

src/NHibernate/Impl/AbstractSessionImpl.cs

@@ -314,17 +314,26 @@ public ProcessHelper(AbstractSessionImpl session)
 			{
 				_session = session;
 				_context = new SessionIdLoggingContext(session.SessionId);
-				session.CheckAndUpdateSessionStatus();
-				_session._processing = true;
+				try
+				{
+					_session.CheckAndUpdateSessionStatus();
+					_session._processing = true;
+				}
+				catch
+				{
+					_context.Dispose();
+					_context = null;
+					throw;
+				}
 			}
 
 			public void Dispose()
 			{
+				_context.Dispose();
+				_context = null;
 				if (_session == null)
 					throw new ObjectDisposedException("The session process helper has been disposed already");
 				_session._processing = false;
-				_context.Dispose();
-				_context = null;
 				_session = null;
 			}
 		}