aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-07-18 11:01:32 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-18 11:02:08 +0200
commite210895ba95e498b9debbf43a3e5ae588bca81f0 (patch)
tree3031bf112cbfccf562a122a5e09b91ab07739aa3 /activerecord/lib
parentfa98eca75bd8666719bf3d061c87638850a20fe9 (diff)
downloadrails-e210895ba95e498b9debbf43a3e5ae588bca81f0.tar.gz
rails-e210895ba95e498b9debbf43a3e5ae588bca81f0.tar.bz2
rails-e210895ba95e498b9debbf43a3e5ae588bca81f0.zip
Avoid uneeded queries in session stores if sid is not given.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/session_store.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index df2f429c5d..7ea7fb5c51 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -294,7 +294,6 @@ module ActiveRecord
private
def get_session(env, sid)
Base.silence do
- sid ||= generate_sid
session = find_session(sid)
env[SESSION_RECORD_KEY] = session
[sid, session.data]