diff options
| -rw-r--r-- | activesupport/CHANGELOG | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object_and_class.rb | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 3d93b561b4..b72d2fd5ed 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,10 @@ *SVN* +* Remove fix against memory leaks in development mode as it killed development performance on large applications (2-3s stall on Basecamp). Octopod is working on a better fix. + + +*1.1.0* + * Fixed conflict with Glue gem #1606 [Rick Olson] * Added new rules to the Inflector to deal with more unusual plurals mouse/louse => mice/lice, information => information, ox => oxen, virus => viri, archive => archives #1571, #1583, #1490, #1599, #1608 [foamdino@gmail.com/others] 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 968c3bdeac..bd67b3d1fa 100644 --- a/activesupport/lib/active_support/core_ext/object_and_class.rb +++ b/activesupport/lib/active_support/core_ext/object_and_class.rb @@ -1,14 +1,18 @@ class Object #:nodoc: def remove_subclasses_of(superclass) 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 + # remove_instance_variables_of(klass) Object.send(:remove_const, subclass) rescue nil end end + + def remove_instance_variables_of(klass) + ObjectSpace.each_object(Class) do |k| + if k.to_s == klass + k.instance_variables.each { |v| k.send(:remove_instance_variable, v) } + end + end + end def subclasses_of(superclass) subclasses = [] |