From 067780d08f5cec6d9affda1136d23791509a8f90 Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Sun, 9 Dec 2007 14:52:58 +0000 Subject: [PATCH] 2007-12-04 Robert Jordan * MethodCall.cs (ResolveMethod): Handle server objects registered with RemotingServices.Marshal (obj, typeof (ISomeInterface)). Fixes #324232. Test case: /trunk/gert/standalone/bug82302/. svn path=/trunk/mcs/; revision=91003 --- .../corlib/System.Runtime.Remoting.Messaging/ChangeLog | 6 ++++++ .../corlib/System.Runtime.Remoting.Messaging/MethodCall.cs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog index 8935d75efcb..fc3858d0213 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Robert Jordan + + * MethodCall.cs (ResolveMethod): Handle server objects registered + with RemotingServices.Marshal (obj, typeof (ISomeInterface)). + Fixes #324232. Test case: /trunk/gert/standalone/bug82302/. + 2007-11-21 Atsushi Enomoto * CallContext.cs : added missing 2.0 stuff. diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs index 94069d1727e..9a9ff8931ab 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs @@ -333,7 +333,7 @@ namespace System.Runtime.Remoting.Messaging { // If the method is implemented in an interface, look for the method implementation. // It can't be done in the previous GetMethodBaseFromName call because at that point we // may not yet have the method signature. - if (requestType != type && requestType.IsInterface) { + if (requestType != type && requestType.IsInterface && !type.IsInterface) { _methodBase = RemotingServices.GetVirtualMethod (type, _methodBase); if (_methodBase == null) throw new RemotingException ("Method " + _methodName + " not found in " + type); -- 2.25.1