Backport of r110121

svn path=/branches/mono-2-0/mcs/; revision=110122
baulig · Aug 11, 2008 · b2882b3 · b2882b3
1 parent 1c482a5
commit b2882b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/mcs/class/System.Web/System.Web.Caching/Cache.cs b/mcs/class/System.Web/System.Web.Caching/Cache.cs
@@ -243,6 +243,10 @@ object Remove (string key, CacheItemRemovedReason reason, bool doLock)
 			}
 
 			if (it != null) {
+				Timer t = it.Timer;
+				if (t != null)
+					t.Dispose ();
+
 				if (it.Dependency != null) {
 #if NET_2_0
 					it.Dependency.SetCache (null);

diff --git a/mcs/class/System.Web/System.Web.Caching/ChangeLog b/mcs/class/System.Web/System.Web.Caching/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-11  Marek Habersack  <mhabersack@novell.com>
+
+	* Cache.cs: dispose item timer when removing an entry. Fixes bug
+	#416076. Patch provided by Adriaan van Kekem
+	<adriaanvk@gmail.com>, thanks!
+
 2008-06-18  Marek Habersack  <mhabersack@novell.com>
 
 	* SqlCacheDependency.cs: added