Avoid unnecessary persister lookup in Loader (#1537)

bahusoid · fredericDelaporte · commit 55ca5ee87b6b · 2018-01-19T14:23:16.000+01:00
diff --git a/src/NHibernate/Async/Loader/Loader.cs b/src/NHibernate/Async/Loader/Loader.cs
@@ -706,7 +706,9 @@ private async Task LoadFromResultSetAsync(DbDataReader rs, int i, object obj, st
 			object id = key.Identifier;
 
 			// Get the persister for the _subclass_
-			ILoadable persister = (ILoadable)Factory.GetEntityPersister(instanceClass);
+			ILoadable persister = instanceClass == rootPersister.EntityName
+				? rootPersister
+				: (ILoadable) Factory.GetEntityPersister(instanceClass);
 
 			if (Log.IsDebugEnabled())
 			{
diff --git a/src/NHibernate/Loader/Loader.cs b/src/NHibernate/Loader/Loader.cs
@@ -1062,7 +1062,9 @@ private void LoadFromResultSet(DbDataReader rs, int i, object obj, string instan
 			object id = key.Identifier;
 
 			// Get the persister for the _subclass_
-			ILoadable persister = (ILoadable)Factory.GetEntityPersister(instanceClass);
+			ILoadable persister = instanceClass == rootPersister.EntityName
+				? rootPersister
+				: (ILoadable) Factory.GetEntityPersister(instanceClass);
 
 			if (Log.IsDebugEnabled())
 			{

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,9 @@ private async Task LoadFromResultSetAsync(DbDataReader rs, int i, object obj, st`
`706`	`706`	`object id = key.Identifier;`
`707`	`707`
`708`	`708`	`// Get the persister for the _subclass_`
`709`		`- ILoadable persister = (ILoadable)Factory.GetEntityPersister(instanceClass);`
	`709`	`+ ILoadable persister = instanceClass == rootPersister.EntityName`
	`710`	`+ ? rootPersister`
	`711`	`+ : (ILoadable) Factory.GetEntityPersister(instanceClass);`
`710`	`712`
`711`	`713`	`if (Log.IsDebugEnabled())`
`712`	`714`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1062,7 +1062,9 @@ private void LoadFromResultSet(DbDataReader rs, int i, object obj, string instan`
`1062`	`1062`	`object id = key.Identifier;`
`1063`	`1063`
`1064`	`1064`	`// Get the persister for the _subclass_`
`1065`		`- ILoadable persister = (ILoadable)Factory.GetEntityPersister(instanceClass);`
	`1065`	`+ ILoadable persister = instanceClass == rootPersister.EntityName`
	`1066`	`+ ? rootPersister`
	`1067`	`+ : (ILoadable) Factory.GetEntityPersister(instanceClass);`
`1066`	`1068`
`1067`	`1069`	`if (Log.IsDebugEnabled())`
`1068`	`1070`	`{`