* RemotingServices.cs: If the type for a proxy is not available in

	  the client site, use the MarshalByRefObject type.

svn path=/trunk/mcs/; revision=16658

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
index 073c240c1df4f373e3960b3c026844656e90d2b1..572aa399db225c483f6da6373a6aab08179f5f26 100755 (executable)
--- a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-25  Lluis Sanchez Gual <lluis@ximian.com>
+
+       * RemotingServices.cs: If the type for a proxy is not available in
+         the client site, use the MarshalByRefObject type.
+
 2003-07-21  Lluis Sanchez Gual <lluis@ximian.com>
 
        * ServerIdentity.cs: Fixed bug #46645

diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
index ebc163191a0ab4a271ad13078d344dad84f7c3b5..3357888289b565f9dca1dd5a5a6c30f4a6d9e671 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -148,6 +148,7 @@ namespace System.Runtime.Remoting
                        // FIXME: use type name when fRefine==true
 
                        Type classToProxy = fRefine ? objref.ServerType : typeof (MarshalByRefObject);
+                       if (classToProxy == null) classToProxy = typeof (MarshalByRefObject);
 
                        if (objref.IsReferenceToWellKnow)
                                return GetRemoteObject(objref, classToProxy);
@@ -409,12 +410,12 @@ namespace System.Runtime.Remoting
                        IMessageSink sink = ChannelServices.CreateClientChannelSinkChain (url, channelData, out objectUri);
                        if (sink == null) 
                        {
-                               if (url != null) \r
+                               if (url != null) 
                                {
                                        string msg = String.Format ("Cannot create channel sink to connect to URL {0}. An appropriate channel has probably not been registered.", url); 
                                        throw new RemotingException (msg);
                                }
-                               else \r
+                               else 
                                {
                                        string msg = String.Format ("Cannot create channel sink to connect to the remote object. An appropriate channel has probably not been registered.", url); 
                                        throw new RemotingException (msg);