Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

r2932@asus: jeremy | 2005-07-08 14:21:36 -0700

 Silence find_by_session_id also.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1771 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 37f90e0f6b39e6d0cf0463e5fe6799aa6a1c922b 1 parent c18961f
@jeremy jeremy authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 actionpack/lib/action_controller/session/active_record_store.rb
View
8 actionpack/lib/action_controller/session/active_record_store.rb
@@ -27,7 +27,7 @@ class Session
# initialize(hash_of_session_id_and_data)
# attr_reader :session_id
# attr_accessor :data
- # save!
+ # save
# destroy
#
# The fast SqlBypass class is a generic SQL session store. You may
@@ -198,7 +198,7 @@ def data
@data
end
- def save!
+ def save
marshaled_data = self.class.marshal(data)
if @new_record
@new_record = false
@@ -240,7 +240,7 @@ def destroy
# Find or instantiate a session given a CGI::Session.
def initialize(session, option = nil)
session_id = session.session_id
- unless @session = @@session_class.find_by_session_id(session_id)
+ unless @session = ActiveRecord::Base.silence { @@session_class.find_by_session_id(session_id) }
unless session.new_session
raise CGI::Session::NoSession, 'uninitialized session'
end
@@ -258,7 +258,7 @@ def restore
# Save session store.
def update
if @session
- ActiveRecord::Base.silence { @session.save! }
+ ActiveRecord::Base.silence { @session.save }
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.