2010-02-26 Robert Jordan <robertj@gmx.net>

	* ObjRef.cs (GetRealObject): Refine to server type only when
	necessary. Fixes #504886.

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
index de9397523361f56cfbf28ac864031a5a1d9cd7bf..8319bbc0db6b2abe1fe916970bb17175dca3567d 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-26  Robert Jordan  <robertj@gmx.net>
+
+       * ObjRef.cs (GetRealObject): Refine to server type only when
+       necessary. Fixes #504886.
+
 2010-02-05 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * RemotingServices.cs (InternalExecuteMessage): Properly

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs b/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs
index 7c5edb0a859d0465b0bfa07685fe61a2bae3d44b..765bbe35f5899d5819af3e7bb9ee34e000db0664 100644 (file)
--- 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);
+                               return RemotingServices.Unmarshal (this, IsReferenceToWellKnow);
                        else
                                return this;
                }