2008-03-01 Ivan N. Zlatev <contact@i-nz.net>

* Component.cs: Do not set the Site to null on disposing as this is the Containers job. Instead try to remove from Container if sited. svn path=/trunk/mcs/; revision=97093
mono · Mar 1, 2008 · be577e6 · be577e6
1 parent baec40e
commit be577e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/mcs/class/System/System.ComponentModel/ChangeLog b/mcs/class/System/System.ComponentModel/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-01  Ivan N. Zlatev  <contact@i-nz.net>
+
+	* Component.cs: Do not set the Site to null on disposing as this 
+	is the Containers job. Instead try to remove from Container if sited.
+
 2008-02-26  Gert Driesen  <drieseng@users.sourceforge.net>
 
 	* CharConverter.cs: Use trimmed value in FormatException.

diff --git a/mcs/class/System/System.ComponentModel/Component.cs b/mcs/class/System/System.ComponentModel/Component.cs
@@ -131,11 +131,12 @@ public void Dispose ()
 		protected virtual void Dispose (bool release_all)
 		{
 			if (release_all) {
+				if (mySite != null && mySite.Container != null)
+					mySite.Container.Remove (this);
 				EventHandler eh = (EventHandler) Events [disposedEvent];
 				if (eh != null)
 					eh (this, EventArgs.Empty);
 			}
-			mySite = null;
 		}
 
 		protected virtual object GetService (Type service)