Author: svetlana
Date: 2005-11-06 06:48:12 -0500 (Sun, 06 Nov 2005)
New Revision: 52623
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
trunk/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
trunk/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
Log:
Fix RemotingConfiguration.cs (ConfigHandler.OnEndElement) and ServerIdentity.cs
(DisposeServerObject)
Modified: trunk/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting/ChangeLog 2005-11-06
11:08:53 UTC (rev 52622)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting/ChangeLog 2005-11-06
11:48:12 UTC (rev 52623)
@@ -1,3 +1,9 @@
+2005-11-06 Svetlana Zholkovsky <[EMAIL PROTECTED]>
+
+ * RemotingConfiguration.cs: Fix ConfigHandler.OnEndElement to handle
case
+ when the configuration file contains custom providers with child
elements.
+ * ServerIdentity.cs: clear _serverSink field in the DisposeServerObject
method.
+
2005-10-18 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* RemotingConfiguration.cs: The value for customErrors tag must be
Modified:
trunk/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
2005-11-06 11:08:53 UTC (rev 52622)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
2005-11-06 11:48:12 UTC (rev 52623)
@@ -578,8 +578,8 @@
if (currentProviderData != null)
{
currentProviderData.Pop ();
- if (currentProviderData.Count > 0) return;
- currentProviderData = null;
+ if (currentProviderData.Count == 0)
+ currentProviderData = null;
}
currentXmlPath = currentXmlPath.Substring (0,
currentXmlPath.Length - name.Length - 1);
Modified: trunk/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
2005-11-06 11:08:53 UTC (rev 52622)
+++ trunk/mcs/class/corlib/System.Runtime.Remoting/ServerIdentity.cs
2005-11-06 11:48:12 UTC (rev 52623)
@@ -103,6 +103,8 @@
public void AttachServerObject (MarshalByRefObject
serverObject, Context context)
{
+ DisposeServerObject();
+
_context = context;
_serverObject = serverObject;
@@ -143,6 +145,7 @@
if (_serverObject != null) {
_serverObject.ObjectIdentity = null;
_serverObject = null;
+ _serverSink = null;
}
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
