fixup! Modified field interceptor to skip initialization of lazy properties when setting one

Author: hazzik

src/NHibernate/Async/Engine/Cascade.cs

@@ -60,12 +60,12 @@ public async Task CascadeOnAsync(IEntityPersister persister, object parent, obje
 
 				IType[] types = persister.PropertyTypes;
 				CascadeStyle[] cascadeStyles = persister.PropertyCascadeStyles;
-				ISet<string> uninitializedLazyProperties = persister.GetUninitializedLazyProperties(parent);
+				var uninitializedLazyProperties = persister.GetUninitializedLazyProperties(parent);
 				for (int i = 0; i < types.Length; i++)
 				{
 					CascadeStyle style = cascadeStyles[i];
 					string propertyName = persister.PropertyNames[i];
-					if (uninitializedLazyProperties.Contains(persister.PropertyNames[i]) && persister.PropertyLaziness[i] && !action.PerformOnLazyProperty)
+					if (uninitializedLazyProperties.Contains(propertyName) && persister.PropertyLaziness[i] && !action.PerformOnLazyProperty)
 					{
 						//do nothing to avoid a lazy property initialization
 						continue;

src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs

@@ -877,10 +877,7 @@ public async Task UpdateAsync(object id, object[] fields, int[] dirtyFields, boo
 			if (entry == null && !IsMutable)
 				throw new InvalidOperationException("Updating immutable entity that is not in session yet!");
 
-			if ((entityMetamodel.IsDynamicUpdate && dirtyFields != null) ||
-				// When having a dirty lazy property and the entity is not yet initialized we have to use a dynamic update for it even if
-				// it is disabled in order to have it updated.
-				(GetUninitializedLazyProperties(obj).Count > 0 && dirtyFields?.Count(o => PropertyLaziness[o]) > 0))
+			if (dirtyFields != null && (entityMetamodel.IsDynamicUpdate || HasDirtyLazyProperties(dirtyFields, obj)))
 			{
 				// For the case of dynamic-update="true", we need to generate the UPDATE SQL
 				propsToUpdate = GetPropertiesToUpdate(dirtyFields, hasDirtyCollection);

src/NHibernate/Engine/Cascade.cs

@@ -113,12 +113,12 @@ public void CascadeOn(IEntityPersister persister, object parent, object anything
 
 				IType[] types = persister.PropertyTypes;
 				CascadeStyle[] cascadeStyles = persister.PropertyCascadeStyles;
-				ISet<string> uninitializedLazyProperties = persister.GetUninitializedLazyProperties(parent);
+				var uninitializedLazyProperties = persister.GetUninitializedLazyProperties(parent);
 				for (int i = 0; i < types.Length; i++)
 				{
 					CascadeStyle style = cascadeStyles[i];
 					string propertyName = persister.PropertyNames[i];
-					if (uninitializedLazyProperties.Contains(persister.PropertyNames[i]) && persister.PropertyLaziness[i] && !action.PerformOnLazyProperty)
+					if (uninitializedLazyProperties.Contains(propertyName) && persister.PropertyLaziness[i] && !action.PerformOnLazyProperty)
 					{
 						//do nothing to avoid a lazy property initialization
 						continue;

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

@@ -3167,10 +3167,7 @@ public void Update(object id, object[] fields, int[] dirtyFields, bool hasDirtyC
 			if (entry == null && !IsMutable)
 				throw new InvalidOperationException("Updating immutable entity that is not in session yet!");
 
-			if ((entityMetamodel.IsDynamicUpdate && dirtyFields != null) ||
-				// When having a dirty lazy property and the entity is not yet initialized we have to use a dynamic update for it even if
-				// it is disabled in order to have it updated.
-				(GetUninitializedLazyProperties(obj).Count > 0 && dirtyFields?.Count(o => PropertyLaziness[o]) > 0))
+			if (dirtyFields != null && (entityMetamodel.IsDynamicUpdate || HasDirtyLazyProperties(dirtyFields, obj)))
 			{
 				// For the case of dynamic-update="true", we need to generate the UPDATE SQL
 				propsToUpdate = GetPropertiesToUpdate(dirtyFields, hasDirtyCollection);
@@ -3219,6 +3216,13 @@ public void Update(object id, object[] fields, int[] dirtyFields, bool hasDirtyC
 			}
 		}
 
+		private bool HasDirtyLazyProperties(int[] dirtyFields, object obj)
+		{
+			// When having a dirty lazy property and the entity is not yet initialized we have to use a dynamic update for
+			// it even if it is disabled in order to have it updated.
+			return GetUninitializedLazyProperties(obj).Count > 0 && dirtyFields.Any(o => PropertyLaziness[o]);
+		}
+
 		public object Insert(object[] fields, object obj, ISessionImplementor session)
 		{
 			int span = TableSpan;