From 9eb4a2cd77a37af0486581bfe2475a6a2a9c60df Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Fri, 5 Mar 2010 13:09:51 +0000 Subject: [PATCH] 2010-03-05 Robert Jordan * ObjRef.cs (GetRealObject): Revert previous patch as it doesn't cope well with CAD remoting, which doesn't flag well-known types. svn path=/trunk/mcs/; revision=153105 --- mcs/class/corlib/System.Runtime.Remoting/ChangeLog | 5 +++++ mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog index 8319bbc0db6..a652ecf30ed 100644 --- a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog +++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog @@ -1,3 +1,8 @@ +2010-03-05 Robert Jordan + + * ObjRef.cs (GetRealObject): Revert previous patch as it doesn't + cope well with CAD remoting, which doesn't flag well-known types. + 2010-02-26 Robert Jordan * ObjRef.cs (GetRealObject): Refine to server type only when diff --git a/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs b/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs index 765bbe35f58..7c5edb0a859 100644 --- a/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs +++ b/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs @@ -219,7 +219,7 @@ namespace System.Runtime.Remoting { public virtual object GetRealObject (StreamingContext context) { if ((flags & MarshalledObjectRef) > 0) - return RemotingServices.Unmarshal (this, IsReferenceToWellKnow); + return RemotingServices.Unmarshal (this); else return this; } -- 2.25.1