* ObjRef.cs: Fixed type check in in ObjRef constructor. The requested class

	  must be the object class or a base class. This fixes bug #61249.

svn path=/branches/mono-1-0/mcs/; revision=31369

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
index f1c1e51db57518cc1bae4ca02082af477a592edc..14aa52173f9b5d4b630a7264e7ee2ce4152da583 100755 (executable)
--- a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-22  Lluis Sanchez Gual  <lluis@novell.com>
+
+       * ObjRef.cs: Fixed type check in in ObjRef constructor. The requested class
+         must be the object class or a base class. This fixes bug #61249.
+
 2004-07-22  Lluis Sanchez Gual  <lluis@novell.com>
 
        * RemotingServices.cs: Changed GetMethodBaseFromMethodMessage so its code

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs b/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs
index 90db146c2670c2b221d60797082f363b10b3d711..30234367827314cbfaa1b837eebdc0ec1ef83232 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs
@@ -92,7 +92,7 @@ namespace System.Runtime.Remoting {
                        uri = RemotingServices.GetObjectUri(mbr);
                        typeInfo = new TypeInfo(type);
 
-                       if (!typeInfo.CanCastTo(mbr.GetType(), mbr))
+                       if (!type.IsAssignableFrom (mbr.GetType()))
                                throw new RemotingException ("The server object type cannot be cast to the requested type " + type.FullName + ".");
 
                        UpdateChannelInfo();