Apply same logic for IsNotTransient and IsTransient

Author: bahusoid

src/NHibernate/Async/Engine/ForeignKeys.cs

@@ -157,10 +157,6 @@ private async Task<bool> IsNullifiableAsync(string entityName, object obj, Cance
 		public static async Task<bool> IsNotTransientSlowAsync(string entityName, object entity, ISessionImplementor session, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
-			if (entity.IsProxy())
-				return true;
-			if (session.PersistenceContext.IsEntryFor(entity))
-				return true;
 			return !await (IsTransientSlowAsync(entityName, entity, session, cancellationToken)).ConfigureAwait(false);
 		}
 
@@ -171,38 +167,25 @@ public static async Task<bool> IsNotTransientSlowAsync(string entityName, object
 		/// <remarks>
 		/// Don't hit the database to make the determination, instead return null; 
 		/// </remarks>
-		public static Task<bool?> IsTransientFastAsync(string entityName, object entity, ISessionImplementor session, CancellationToken cancellationToken)
+		public static async Task<bool?> IsTransientFastAsync(string entityName, object entity, ISessionImplementor session, CancellationToken cancellationToken)
 		{
-			if (cancellationToken.IsCancellationRequested)
+			cancellationToken.ThrowIfCancellationRequested();
+			if (Equals(Intercept.LazyPropertyInitializer.UnfetchedProperty, entity))
 			{
-				return Task.FromCanceled<bool?>(cancellationToken);
+				// an unfetched association can only point to
+				// an entity that already exists in the db
+				return false;
 			}
-			try
-			{
-				if (Equals(Intercept.LazyPropertyInitializer.UnfetchedProperty, entity))
-				{
-					// an unfetched association can only point to
-					// an entity that already exists in the db
-					return Task.FromResult<bool?>(false);
-				}
 
-				// let the interceptor inspect the instance to decide
-				var isTransient = session.Interceptor.IsTransient(entity);
-				if (isTransient.HasValue)
-					return Task.FromResult<bool?>(isTransient);
+			if (entity.IsProxy())
+				return false;
 
-				if (entity is INHibernateProxy proxy && proxy.HibernateLazyInitializer.IsUninitialized)
-				{
-					return Task.FromResult<bool?>(false);
-				}
+			if (session.PersistenceContext.IsEntryFor(entity))
+				return false;
 
-				// let the persister inspect the instance to decide
-				return session.GetEntityPersister(entityName, entity).IsTransientAsync(entity, session, cancellationToken);
-			}
-			catch (System.Exception ex)
-			{
-				return Task.FromException<bool?>(ex);
-			}
+			// let the persister inspect the instance to decide
+			return session.Interceptor.IsTransient(entity) ??
+			       await (session.GetEntityPersister(entityName, entity).IsTransientAsync(entity, session, cancellationToken)).ConfigureAwait(false);
 		}
 
 		/// <summary> 

src/NHibernate/Engine/ForeignKeys.cs

@@ -155,10 +155,6 @@ private bool IsNullifiable(string entityName, object obj)
 		/// </remarks>
 		public static bool IsNotTransientSlow(string entityName, object entity, ISessionImplementor session)
 		{
-			if (entity.IsProxy())
-				return true;
-			if (session.PersistenceContext.IsEntryFor(entity))
-				return true;
 			return !IsTransientSlow(entityName, entity, session);
 		}
 
@@ -171,25 +167,23 @@ public static bool IsNotTransientSlow(string entityName, object entity, ISession
 		/// </remarks>
 		public static bool? IsTransientFast(string entityName, object entity, ISessionImplementor session)
 		{
+			if (entity.IsProxy())
+				return false;
+
 			if (Equals(Intercept.LazyPropertyInitializer.UnfetchedProperty, entity))
 			{
 				// an unfetched association can only point to
 				// an entity that already exists in the db
 				return false;
 			}
 
-			// let the interceptor inspect the instance to decide
-			var isTransient = session.Interceptor.IsTransient(entity);
-			if (isTransient.HasValue)
-				return isTransient;
-
-			if (entity is INHibernateProxy proxy && proxy.HibernateLazyInitializer.IsUninitialized)
-			{
+			if (session.PersistenceContext.IsEntryFor(entity))
 				return false;
-			}
 
+			// let the interceptor inspect the instance to decide
 			// let the persister inspect the instance to decide
-			return session.GetEntityPersister(entityName, entity).IsTransient(entity, session);
+			return session.Interceptor.IsTransient(entity) ??
+			       session.GetEntityPersister(entityName, entity).IsTransient(entity, session);
 		}
 
 		/// <summary> 

src/NHibernate/Tuple/Entity/AbstractEntityTuplizer.cs

@@ -114,11 +114,6 @@ public object Instantiate(object id)
 
 		public object GetIdentifier(object entity)
 		{
-			if (entity is INHibernateProxy proxy)
-			{
-				return proxy.HibernateLazyInitializer.Identifier;
-			}
-			
 			object id;
 			if (entityMetamodel.IdentifierProperty.IsEmbedded)
 			{