From 7e1d002673777bb1240e27949a853a8f287d1f56 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 30 Jun 2005 06:11:26 +0000 Subject: Fixed memory leak with Object#remove_subclasses_of, which inflicted a Rails application running in development mode with a ~20KB leak per request #1289 [c.r.mcgrath@gmail.com] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1569 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/core_ext/object_and_class.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'activesupport/lib/active_support/core_ext/object_and_class.rb') diff --git a/activesupport/lib/active_support/core_ext/object_and_class.rb b/activesupport/lib/active_support/core_ext/object_and_class.rb index b8e9d27217..968c3bdeac 100644 --- a/activesupport/lib/active_support/core_ext/object_and_class.rb +++ b/activesupport/lib/active_support/core_ext/object_and_class.rb @@ -1,6 +1,13 @@ class Object #:nodoc: def remove_subclasses_of(superclass) - subclasses_of(superclass).each { |subclass| Object.send(:remove_const, subclass) rescue nil } + subclasses_of(superclass).each do |subclass| + ObjectSpace.each_object(Class) do |k| + if k.to_s == subclass + k.instance_variables.each { |v| k.send(:remove_instance_variable, v) } + end + end + Object.send(:remove_const, subclass) rescue nil + end end def subclasses_of(superclass) -- cgit v1.2.3