Do not call AfterOperation for overloads with LockMode

Author: bahusoid

src/NHibernate/Async/ISession.cs

@@ -72,11 +72,29 @@ public static partial class SessionExtensions
 		/// <param name="lockMode">The lock mode to use for getting the entity.</param>
 		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
 		/// <returns>A persistent instance, or <see langword="null" />.</returns>
-		public static async Task<T> GetAsync<T>(this ISession session, string entityName, object id, LockMode lockMode = null, CancellationToken cancellationToken = default(CancellationToken))
+		public static async Task<T> GetAsync<T>(this ISession session, string entityName, object id, LockMode lockMode, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			return (T) await (session.GetAsync(entityName, id, lockMode, cancellationToken)).ConfigureAwait(false);
 		}
+
+		//NOTE: Keep it as extension
+		/// <summary>
+		/// Return the persistent instance of the given entity name with the given identifier, or null
+		/// if there is no such persistent instance. (If the instance, or a proxy for the instance, is
+		/// already associated with the session, return that instance or proxy.)
+		/// </summary>
+		/// <typeparam name="T">The entity class.</typeparam>
+		/// <param name="session">The session.</param>
+		/// <param name="entityName">The entity name.</param>
+		/// <param name="id">The entity identifier.</param>
+		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
+		/// <returns>A persistent instance, or <see langword="null" />.</returns>
+		public static async Task<T> GetAsync<T>(this ISession session, string entityName, object id, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			return (T) await (session.GetAsync(entityName, id, cancellationToken)).ConfigureAwait(false);
+		}
 	}
 
 	public partial interface ISession : IDisposable

src/NHibernate/Async/Impl/SessionImpl.cs

@@ -803,42 +803,31 @@ public override async Task<bool> AutoFlushIfRequiredAsync(ISet<string> querySpac
 			return LoadAsync(entityClass.FullName, id, cancellationToken);
 		}
 
-		public Task<T> GetAsync<T>(object id, CancellationToken cancellationToken = default(CancellationToken))
+		/// <inheritdoc />
+		public async Task<T> GetAsync<T>(object id, CancellationToken cancellationToken = default(CancellationToken))
 		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<T>(cancellationToken);
-			}
-			return GetAsync<T>(id, lockMode: null, cancellationToken: cancellationToken);
+			cancellationToken.ThrowIfCancellationRequested();
+			return (T) await (GetAsync(typeof(T), id, cancellationToken)).ConfigureAwait(false);
 		}
 
+		/// <inheritdoc />
 		public async Task<T> GetAsync<T>(object id, LockMode lockMode, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			return (T) await (GetAsync(typeof(T), id, lockMode, cancellationToken)).ConfigureAwait(false);
 		}
 
+		/// <inheritdoc />
 		public Task<object> GetAsync(System.Type entityClass, object id, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			if (cancellationToken.IsCancellationRequested)
 			{
 				return Task.FromCanceled<object>(cancellationToken);
 			}
-			return GetAsync(entityClass, id, lockMode: null, cancellationToken: cancellationToken);
+			return GetAsync(entityClass.FullName, id, cancellationToken);
 		}
 
-		/// <summary>
-		/// Load the data for the object with the specified id into a newly created object
-		/// using "for update", if supported. A new key will be assigned to the object.
-		/// This should return an existing proxy where appropriate.
-		///
-		/// If the object does not exist in the database, null is returned.
-		/// </summary>
-		/// <param name="clazz"></param>
-		/// <param name="id"></param>
-		/// <param name="lockMode"></param>
-		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
-		/// <returns></returns>
+		/// <inheritdoc />
 		public Task<object> GetAsync(System.Type clazz, object id, LockMode lockMode, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			if (cancellationToken.IsCancellationRequested)
@@ -855,6 +844,19 @@ public async Task<object> GetAsync(string entityName, object id, LockMode lockMo
 			using (BeginProcess())
 			{
 				LoadEvent loadEvent = new LoadEvent(id, entityName, lockMode, this);
+				await (FireLoadAsync(loadEvent, LoadEventListener.Get, cancellationToken)).ConfigureAwait(false);
+				//Note: AfterOperation call is skipped to avoid releasing the lock when outside of a transaction.
+				return loadEvent.Result;
+			}
+		}
+
+		/// <inheritdoc />
+		public async Task<object> GetAsync(string entityName, object id, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			cancellationToken.ThrowIfCancellationRequested();
+			using (BeginProcess())
+			{
+				LoadEvent loadEvent = new LoadEvent(id, entityName, null, this);
 				bool success = false;
 				try
 				{
@@ -898,15 +900,6 @@ public async Task<object> GetAsync(string entityName, object id, LockMode lockMo
 			}
 		}
 
-		public Task<object> GetAsync(string entityName, object id, CancellationToken cancellationToken = default(CancellationToken))
-		{
-			if (cancellationToken.IsCancellationRequested)
-			{
-				return Task.FromCanceled<object>(cancellationToken);
-			}
-			return GetAsync(entityName, id, null, cancellationToken);
-		}
-
 		/// <summary>
 		/// Load the data for the object with the specified id into a newly created object.
 		/// This is only called when lazily initializing a proxy.

src/NHibernate/ISession.cs

@@ -79,10 +79,26 @@ public static object Get(this ISession session, string entityName, object id, Lo
 		/// <param name="id">The entity identifier.</param>
 		/// <param name="lockMode">The lock mode to use for getting the entity.</param>
 		/// <returns>A persistent instance, or <see langword="null" />.</returns>
-		public static T Get<T>(this ISession session, string entityName, object id, LockMode lockMode = null)
+		public static T Get<T>(this ISession session, string entityName, object id, LockMode lockMode)
 		{
 			return (T) session.Get(entityName, id, lockMode);
 		}
+
+		//NOTE: Keep it as extension
+		/// <summary>
+		/// Return the persistent instance of the given entity name with the given identifier, or null
+		/// if there is no such persistent instance. (If the instance, or a proxy for the instance, is
+		/// already associated with the session, return that instance or proxy.)
+		/// </summary>
+		/// <typeparam name="T">The entity class.</typeparam>
+		/// <param name="session">The session.</param>
+		/// <param name="entityName">The entity name.</param>
+		/// <param name="id">The entity identifier.</param>
+		/// <returns>A persistent instance, or <see langword="null" />.</returns>
+		public static T Get<T>(this ISession session, string entityName, object id)
+		{
+			return (T) session.Get(entityName, id);
+		}
 	}
 
 	/// <summary>

src/NHibernate/Impl/SessionImpl.cs

@@ -1156,32 +1156,25 @@ public object Load(System.Type entityClass, object id)
 			return Load(entityClass.FullName, id);
 		}
 
+		/// <inheritdoc />
 		public T Get<T>(object id)
 		{
-			return Get<T>(id, lockMode: null);
+			return (T) Get(typeof(T), id);
 		}
 
+		/// <inheritdoc />
 		public T Get<T>(object id, LockMode lockMode)
 		{
 			return (T) Get(typeof(T), id, lockMode);
 		}
 
+		/// <inheritdoc />
 		public object Get(System.Type entityClass, object id)
 		{
-			return Get(entityClass, id, lockMode: null);
+			return Get(entityClass.FullName, id);
 		}
 
-		/// <summary>
-		/// Load the data for the object with the specified id into a newly created object
-		/// using "for update", if supported. A new key will be assigned to the object.
-		/// This should return an existing proxy where appropriate.
-		///
-		/// If the object does not exist in the database, null is returned.
-		/// </summary>
-		/// <param name="clazz"></param>
-		/// <param name="id"></param>
-		/// <param name="lockMode"></param>
-		/// <returns></returns>
+		/// <inheritdoc />
 		public object Get(System.Type clazz, object id, LockMode lockMode)
 		{
 			return Get(clazz.FullName, id, lockMode);
@@ -1193,6 +1186,18 @@ public object Get(string entityName, object id, LockMode lockMode)
 			using (BeginProcess())
 			{
 				LoadEvent loadEvent = new LoadEvent(id, entityName, lockMode, this);
+				FireLoad(loadEvent, LoadEventListener.Get);
+				//Note: AfterOperation call is skipped to avoid releasing the lock when outside of a transaction.
+				return loadEvent.Result;
+			}
+		}
+
+		/// <inheritdoc />
+		public object Get(string entityName, object id)
+		{
+			using (BeginProcess())
+			{
+				LoadEvent loadEvent = new LoadEvent(id, entityName, null, this);
 				bool success = false;
 				try
 				{
@@ -1235,11 +1240,6 @@ public string GetEntityName(object obj)
 			}
 		}
 
-		public object Get(string entityName, object id)
-		{
-			return Get(entityName, id, null);
-		}
-
 		/// <summary>
 		/// Load the data for the object with the specified id into a newly created object.
 		/// This is only called when lazily initializing a proxy.