diff options
author | José Valim <jose.valim@gmail.com> | 2010-11-28 16:55:48 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-11-28 16:55:53 +0100 |
commit | e444439fe28f873c783a4b99b1c9f29a7405dd0d (patch) | |
tree | 75ac578b9a756cabf8af1d08e969d3623f440610 /activerecord/lib/active_record/session_store.rb | |
parent | 31906eecdf7bffc2203379c5d40f1bb77fb35858 (diff) | |
download | rails-e444439fe28f873c783a4b99b1c9f29a7405dd0d.tar.gz rails-e444439fe28f873c783a4b99b1c9f29a7405dd0d.tar.bz2 rails-e444439fe28f873c783a4b99b1c9f29a7405dd0d.zip |
Partialy revert f1c13b0dd7b22b5f6289ca1a09f1d7a8c7c8584b
Diffstat (limited to 'activerecord/lib/active_record/session_store.rb')
-rw-r--r-- | activerecord/lib/active_record/session_store.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb index ba99800fb2..3400fd6ade 100644 --- a/activerecord/lib/active_record/session_store.rb +++ b/activerecord/lib/active_record/session_store.rb @@ -228,7 +228,7 @@ module ActiveRecord @session_id = attributes[:session_id] @data = attributes[:data] @marshaled_data = attributes[:marshaled_data] - @persisted = !@marshaled_data.nil? + @new_record = @marshaled_data.nil? end # Lazy-unmarshal session state. @@ -252,8 +252,8 @@ module ActiveRecord marshaled_data = self.class.marshal(data) connect = connection - unless @persisted - @persisted = true + if @new_record + @new_record = false connect.update <<-end_sql, 'Create session' INSERT INTO #{table_name} ( #{connect.quote_column_name(session_id_column)}, @@ -272,7 +272,7 @@ module ActiveRecord end def destroy - return unless @persisted + return if @new_record connect = connection connect.delete <<-end_sql, 'Destroy session' |