github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make data writer private. Marshal/unmarshal handle nil.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3108 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2005-11-20 08:15:51 +00:00
parent c7bc10b2e4
commit 63b792162b
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
actionpack/lib/action_controller/session/active_record_store.rb
View File

@@ -80,8 +80,8 @@ class CGI
find_by_session_id(session_id)
end
def marshal(data) Base64.encode64(Marshal.dump(data)) end
def unmarshal(data) Marshal.load(Base64.decode64(data)) end
def marshal(data) Base64.encode64(Marshal.dump(data)) if data end
def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
def create_table!
connection.execute <<-end_sql
@@ -117,14 +117,14 @@ class CGI
end
end
attr_writer :data
# Lazy-unmarshal session state.
def data
@data ||= self.class.unmarshal(read_attribute(@@data_column_name))
@data ||= self.class.unmarshal(read_attribute(@@data_column_name)) || {}
end
private
attr_writer :data
def marshal_data!
write_attribute(@@data_column_name, self.class.marshal(self.data))
end
@@ -187,8 +187,8 @@ class CGI
end
end
def marshal(data) Base64.encode64(Marshal.dump(data)) end
def unmarshal(data) Marshal.load(Base64.decode64(data)) end
def marshal(data) Base64.encode64(Marshal.dump(data)) if data end
def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
def create_table!
@@connection.execute <<-end_sql
@@ -224,7 +224,7 @@ class CGI
def data
unless @data
if @marshaled_data
@data, @marshaled_data = self.class.unmarshal(@marshaled_data), nil
@data, @marshaled_data = self.class.unmarshal(@marshaled_data) || {}, nil
else
@data = {}
end