Simplifed fix for fetching all lazy properties

Author: Danko Durbić

src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs

@@ -945,6 +945,26 @@ public async Task TestFetchAfterEntityIsInitializedAsync(bool readOnly)
 			Assert.That(NHibernateUtil.IsPropertyInitialized(person, "Formula"), Is.True);
 		}
 
+		[TestCase(true)]
+		[TestCase(false)]
+		public async Task TestFetchAllPropertiesAfterEntityIsInitializedAsync(bool readOnly)
+		{
+			Person person;
+			using(var s = OpenSession())
+			using(var tx = s.BeginTransaction())
+			{
+				person = await (s.CreateQuery("from Person where Id = 1").SetReadOnly(readOnly).UniqueResultAsync<Person>());
+				var image = person.Image;
+				person = await (s.CreateQuery("from Person fetch all properties where Id = 1").SetReadOnly(readOnly).UniqueResultAsync<Person>());
+
+				await (tx.CommitAsync());
+			}
+
+			Assert.That(NHibernateUtil.IsPropertyInitialized(person, "Image"), Is.True);
+			Assert.That(NHibernateUtil.IsPropertyInitialized(person, "Address"), Is.True);
+			Assert.That(NHibernateUtil.IsPropertyInitialized(person, "Formula"), Is.True);
+		}
+
 		[Test]
 		public async Task TestHqlCrossJoinFetchFormulaAsync()
 		{

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

@@ -1408,18 +1408,31 @@ public void InitializeLazyProperties(
 			{
 				throw new HibernateException($"Entity is not associated with the session: {id}");
 			}
-		
-			var lazyProperties = allLazyProperties ? LazyProperties.ToArray() : uninitializedLazyProperties;
-			var metadata = InstrumentationMetadata.LazyPropertiesMetadata;
-			var indexes = new int[lazyProperties.Length];
-			var lazyIndexes = new int[lazyProperties.Length];
-			for (var i = 0; i < lazyProperties.Length; i++)
+
+			int[] indexes;
+			int[] lazyIndexes;
+			if (allLazyProperties)
 			{
-				var descriptor = metadata.GetLazyPropertyDescriptor(lazyProperties[i]);
-				indexes[i] = descriptor.PropertyIndex;
-				lazyIndexes[i] = descriptor.LazyIndex;
+				indexes = lazyPropertyNumbers;
+				lazyIndexes = new int[lazyPropertyNumbers.Length];
+				for(var i = 0; i < lazyIndexes.Length; i++)
+				{
+					lazyIndexes[i] = i;
+				}
 			}
-
+			else
+			{
+				var metadata = InstrumentationMetadata.LazyPropertiesMetadata;
+				indexes = new int[uninitializedLazyProperties.Length];
+				lazyIndexes = new int[uninitializedLazyProperties.Length];
+				for(var i = 0; i < uninitializedLazyProperties.Length; i++)
+				{
+					var descriptor = metadata.GetLazyPropertyDescriptor(uninitializedLazyProperties[i]);
+					indexes[i] = descriptor.PropertyIndex;
+					lazyIndexes[i] = descriptor.LazyIndex;
+				}
+			}
+			
 			var values = Hydrate(rs, id, entity, suffixedPropertyColumns, null, true, indexes, session);
 			for (var i = 0; i < lazyIndexes.Length; i++)
 			{