aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/query_methods.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-02-22 20:03:05 -0200
committerYehuda Katz <yehudakatz@YK.local>2010-02-22 14:08:07 -0800
commitee541049fdbe5eeebcca2f3b83144a5d803345a9 (patch)
treef08791369a72aef2f468a2c452bbcb44bcbb71a0 /activerecord/lib/active_record/relation/query_methods.rb
parent2b43021499f6e00a19eba3e7e48db403a61161bb (diff)
downloadrails-ee541049fdbe5eeebcca2f3b83144a5d803345a9.tar.gz
rails-ee541049fdbe5eeebcca2f3b83144a5d803345a9.tar.bz2
rails-ee541049fdbe5eeebcca2f3b83144a5d803345a9.zip
avoid @lock_value not initialized warning
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 0266700f66..25ffa7860e 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -174,7 +174,7 @@ module ActiveRecord
arel = arel.lock
when String
arel = arel.lock(@lock_value)
- end
+ end if defined?(@lock_value)
arel
end