diff options
| author | Tom Ward <tom@popdog.net> | 2008-04-29 13:21:51 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-20 11:44:23 +0100 |
| commit | ebb642fa3a2b1a4e31abf9610ca634e6bb5d57d3 (patch) | |
| tree | d62b969fa48509a4bd8f228950ad9ce4627be518 /activesupport/lib/active_support | |
| parent | 089251581137b041828a7e6dcbf75ecbef55b4a3 (diff) | |
| download | rails-ebb642fa3a2b1a4e31abf9610ca634e6bb5d57d3.tar.gz rails-ebb642fa3a2b1a4e31abf9610ca634e6bb5d57d3.tar.bz2 rails-ebb642fa3a2b1a4e31abf9610ca634e6bb5d57d3.zip | |
Fix Dependencies watch_frames collection. [#24 state:resolved]
Previously, the code collecting watch_frames could fail leaving
watch_frames defined but nil. The cleanup code checks watch_frames
is defined, but not that it holds a value, raising an undefined method
on NilClass error rather than the original cause. This can make
debugging the underlying cause a total pain.
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index eaba46dd9c..25225d5615 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -384,7 +384,7 @@ module Dependencies #:nodoc: return new_constants ensure # Remove the stack frames that we added. - if defined?(watch_frames) && ! watch_frames.empty? + if defined?(watch_frames) && ! watch_frames.blank? frame_ids = watch_frames.collect(&:object_id) constant_watch_stack.delete_if do |watch_frame| frame_ids.include? watch_frame.object_id |