Merge pull request #2248 from barsgroup/bugfix/35980

[mono.git] / mcs / class / corlib / System.Runtime.Remoting / ServerIdentity.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs b/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
index ea9e8b17b7a032be1618f5f6bad2bacd7b57d4c5..1e075d88b3647f9f3941970a7d57ed6dbc415d87 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
@@ -34,6 +34,7 @@ using System.Runtime.Remoting.Messaging;
 using System.Runtime.Remoting.Contexts;
 using System.Runtime.Remoting.Lifetime;
 using System.Runtime.Remoting.Proxies;
+using System.Runtime.Remoting.Services;
 
 namespace System.Runtime.Remoting
 {
@@ -103,13 +104,16 @@ namespace System.Runtime.Remoting
 
                public void AttachServerObject (MarshalByRefObject serverObject, Context context)
                {
+                       DisposeServerObject();
+
                        _context = context;
                        _serverObject = serverObject;
                        
                        if (RemotingServices.IsTransparentProxy (serverObject))
                        {
                                RealProxy rp = RemotingServices.GetRealProxy (serverObject);
-                               rp.ObjectIdentity = this;
+                               if (rp.ObjectIdentity == null)
+                                       rp.ObjectIdentity = this;
                        }
                        else
                        {
@@ -140,8 +144,11 @@ namespace System.Runtime.Remoting
                        // object is marshalled again.
                        
                        if (_serverObject != null) {
+                               MarshalByRefObject obj = _serverObject;
                                _serverObject.ObjectIdentity = null;
                                _serverObject = null;
+                               _serverSink = null;
+                               TrackingServices.NotifyDisconnectedObject (obj);
                        }
                }
        }
@@ -241,7 +248,7 @@ namespace System.Runtime.Remoting
                        // SingleCallIdentity creates and disposes an instance in each call
 
                        MarshalByRefObject obj = (MarshalByRefObject)Activator.CreateInstance (_objectType, true);
-                       obj.ObjectIdentity = this;
+                       if (obj.ObjectIdentity == null) obj.ObjectIdentity = this;
                        IMessageSink serverSink = _context.CreateServerObjectSinkChain (obj, false);
                        IMessage result = serverSink.SyncProcessMessage (msg);
                        if (obj is IDisposable) ((IDisposable)obj).Dispose();