Replace on one forgotten place

hazzik · hazzik · commit 72afd31d370f · 2022-08-04T17:34:15.000+12:00
diff --git a/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs
@@ -756,7 +756,7 @@ protected async Task<bool> UpdateAsync(object id, object[] fields, object[] oldF
 						if (CheckVersion(includeProperty))
 							await (VersionType.NullSafeSetAsync(statement, oldVersion, index, session, cancellationToken)).ConfigureAwait(false);
 					}
-					else if (entityMetamodel.OptimisticLockMode > Versioning.OptimisticLock.Version && oldFields != null)
+					else if (IsPropertyBasedOptimisticLocking(oldFields))
 					{
 						bool[] versionability = PropertyVersionability;
 						bool[] includeOldField = OptimisticLockMode == Versioning.OptimisticLock.All
diff --git a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs
@@ -3232,7 +3232,7 @@ protected bool Update(object id, object[] fields, object[] oldFields, object row
 						if (CheckVersion(includeProperty))
 							VersionType.NullSafeSet(statement, oldVersion, index, session);
 					}
-					else if (entityMetamodel.OptimisticLockMode > Versioning.OptimisticLock.Version && oldFields != null)
+					else if (IsPropertyBasedOptimisticLocking(oldFields))
 					{
 						bool[] versionability = PropertyVersionability;
 						bool[] includeOldField = OptimisticLockMode == Versioning.OptimisticLock.All

Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,7 @@ protected async Task<bool> UpdateAsync(object id, object[] fields, object[] oldF`
`756`	`756`	`if (CheckVersion(includeProperty))`
`757`	`757`	`await (VersionType.NullSafeSetAsync(statement, oldVersion, index, session, cancellationToken)).ConfigureAwait(false);`
`758`	`758`	`}`
`759`		`- else if (entityMetamodel.OptimisticLockMode > Versioning.OptimisticLock.Version && oldFields != null)`
	`759`	`+ else if (IsPropertyBasedOptimisticLocking(oldFields))`
`760`	`760`	`{`
`761`	`761`	`bool[] versionability = PropertyVersionability;`
`762`	`762`	`bool[] includeOldField = OptimisticLockMode == Versioning.OptimisticLock.All`
Original file line number	Diff line number	Diff line change
`@@ -3232,7 +3232,7 @@ protected bool Update(object id, object[] fields, object[] oldFields, object row`
`3232`	`3232`	`if (CheckVersion(includeProperty))`
`3233`	`3233`	`VersionType.NullSafeSet(statement, oldVersion, index, session);`
`3234`	`3234`	`}`
`3235`		`- else if (entityMetamodel.OptimisticLockMode > Versioning.OptimisticLock.Version && oldFields != null)`
	`3235`	`+ else if (IsPropertyBasedOptimisticLocking(oldFields))`
`3236`	`3236`	`{`
`3237`	`3237`	`bool[] versionability = PropertyVersionability;`
`3238`	`3238`	`bool[] includeOldField = OptimisticLockMode == Versioning.OptimisticLock.All`