diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-03-14 15:46:03 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-14 17:28:27 -0600 |
| commit | 115230e6195115d6200047eb0c3247d3aad82ee7 (patch) | |
| tree | 2622fe981e1764fc6d21c8d0d40822f3644d9a85 /activerecord/lib/active_record/associations.rb | |
| parent | d1eed89ac3b72457c0327bf1ff2a2a9cc8842910 (diff) | |
| download | rails-115230e6195115d6200047eb0c3247d3aad82ee7.tar.gz rails-115230e6195115d6200047eb0c3247d3aad82ee7.tar.bz2 rails-115230e6195115d6200047eb0c3247d3aad82ee7.zip | |
cleaning up some test warnings
Signed-off-by: wycats <wycats@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index b69577f8dd..a5179033f2 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -111,8 +111,11 @@ module ActiveRecord private # Gets the specified association instance if it responds to :loaded?, nil otherwise. def association_instance_get(name) - association = instance_variable_get("@#{name}") - association if association.respond_to?(:loaded?) + ivar = "@#{name}" + if instance_variable_defined?(ivar) + association = instance_variable_get(ivar) + association if association.respond_to?(:loaded?) + end end # Set the specified association instance. |