From 022ec22983d0259be4ef892c60c640e2abc731d3 Mon Sep 17 00:00:00 2001 From: Bob Aman Date: Fri, 15 Aug 2008 15:42:57 -0400 Subject: [PATCH] The == method of ActiveRecord::Reflection was causing an exception when an instance was compared with nil. --- activerecord/lib/active_record/reflection.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 3f74c03..5eb5946 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -109,7 +109,7 @@ module ActiveRecord # Returns +true+ if +self+ and +other_aggregation+ have the same +name+ attribute, +active_record+ attribute, # and +other_aggregation+ has an options hash assigned to it. def ==(other_aggregation) - name == other_aggregation.name && other_aggregation.options && active_record == other_aggregation.active_record + other_aggregation && name == other_aggregation.name && other_aggregation.options && active_record == other_aggregation.active_record end def sanitized_conditions #:nodoc: -- 1.5.4.5