In System.IO:

[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 765b8c040787f0f3e7ac6a247fee6226627ceafb..a2ab4f23046901717fde0d3e178780999b4af564 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
@@ -103,6 +103,8 @@ namespace System.Runtime.Remoting
 
                public void AttachServerObject (MarshalByRefObject serverObject, Context context)
                {
+                       DisposeServerObject();
+
                        _context = context;
                        _serverObject = serverObject;
                        
@@ -143,6 +145,7 @@ namespace System.Runtime.Remoting
                        if (_serverObject != null) {
                                _serverObject.ObjectIdentity = null;
                                _serverObject = null;
+                               _serverSink = null;
                        }
                }
        }