Skip to content

GH-1881 - Fix interface method attributes when generating proxies #1882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

GH-1881 - Fix interface method attributes when generating proxies #1882

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
53154a7
GH-1881 - Fix interface method attributes when generating proxies
PleasantD Oct 19, 2018
27deceb
fixup! GH-1881 - Fix interface method attributes when generating proxies
fredericDelaporte Oct 23, 2018
2000843
Merge remote-tracking branch 'origin/master' into GH1881
hazzik Oct 30, 2018
402f14c
fixup! GH-1881 - Fix interface method attributes when generating proxies
hazzik Oct 30, 2018
5c87d9a
fixup! GH-1881 - Fix interface method attributes when generating proxies
fredericDelaporte Oct 30, 2018
61ed84f
fixup! GH-1881 - Fix interface method attributes when generating proxies
fredericDelaporte Oct 30, 2018
783c575
Merge branch 'master' into GH1881
fredericDelaporte Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/NHibernate/Proxy/NHibernateProxyBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ private static void EmitCallBaseIfLazyInitializerIsNull(
if (method.DeclaringType.IsInterface &&
method.DeclaringType.IsAssignableFrom(parentType))
{
Delegate
var interfaceMap = parentType.GetInterfaceMap(method.DeclaringType);
var methodIndex = Array.IndexOf(interfaceMap.InterfaceMethods, method);
method = interfaceMap.TargetMethods[methodIndex];
Expand Down Expand Up @@ -462,7 +463,7 @@ private static void EmitCallBaseIfLazyInitializerIsNull(
*/

IL.Emit(OpCodes.Ldarg_0);
EmitCallMethod(IL, method.DeclaringType.IsInterface ? OpCodes.Callvirt : OpCodes.Call, method);
EmitCallMethod(IL, OpCodes.Call, method);
IL.Emit(OpCodes.Ret);
}

Expand Down