Fix for async AbstractEntityPersister

Danko Durbić · Danko Durbić · commit ec2c56a05bdb · 2020-08-11T16:45:54.000+02:00
diff --git a/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs
@@ -87,7 +87,12 @@ async Task InternalInitializeLazyPropertiesAsync()
 				int[] lazyIndexes;
 				if (allLazyProperties)
 				{
-					lazyIndexes = indexes = lazyPropertyNumbers;
+					indexes = lazyPropertyNumbers;
+					lazyIndexes = new int[lazyPropertyNumbers.Length];
+					for(var i = 0; i < lazyIndexes.Length; i++)
+					{
+						lazyIndexes[i] = i;
+					}
 				}
 				else
 				{
diff --git a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs
@@ -1425,7 +1425,7 @@ public void InitializeLazyProperties(
 				var metadata = InstrumentationMetadata.LazyPropertiesMetadata;
 				indexes = new int[uninitializedLazyProperties.Length];
 				lazyIndexes = new int[uninitializedLazyProperties.Length];
-				for(var i = 0; i < uninitializedLazyProperties.Length; i++)
+				for (var i = 0; i < uninitializedLazyProperties.Length; i++)
 				{
 					var descriptor = metadata.GetLazyPropertyDescriptor(uninitializedLazyProperties[i]);
 					indexes[i] = descriptor.PropertyIndex;

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,12 @@ async Task InternalInitializeLazyPropertiesAsync()`
`87`	`87`	`int[] lazyIndexes;`
`88`	`88`	`if (allLazyProperties)`
`89`	`89`	`{`
`90`		`- lazyIndexes = indexes = lazyPropertyNumbers;`
	`90`	`+ indexes = lazyPropertyNumbers;`
	`91`	`+ lazyIndexes = new int[lazyPropertyNumbers.Length];`
	`92`	`+ for(var i = 0; i < lazyIndexes.Length; i++)`
	`93`	`+ {`
	`94`	`+ lazyIndexes[i] = i;`
	`95`	`+ }`
`91`	`96`	`}`
`92`	`97`	`else`
`93`	`98`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1425,7 +1425,7 @@ public void InitializeLazyProperties(`
`1425`	`1425`	`var metadata = InstrumentationMetadata.LazyPropertiesMetadata;`
`1426`	`1426`	`indexes = new int[uninitializedLazyProperties.Length];`
`1427`	`1427`	`lazyIndexes = new int[uninitializedLazyProperties.Length];`
`1428`		`- for(var i = 0; i < uninitializedLazyProperties.Length; i++)`
	`1428`	`+ for (var i = 0; i < uninitializedLazyProperties.Length; i++)`
`1429`	`1429`	`{`
`1430`	`1430`	`var descriptor = metadata.GetLazyPropertyDescriptor(uninitializedLazyProperties[i]);`
`1431`	`1431`	`indexes[i] = descriptor.PropertyIndex;`