aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cgi/session.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-30 14:06:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-30 14:06:50 +0000
commitd28d1a2e0a0162a3930f17e0181b0a0197291701 (patch)
tree2979f667dea09e484ffc1cff0812cd2837052e8a /lib/cgi/session.rb
parenteafe72d8cf7e38fbb63815cb3250e7966423cf4f (diff)
downloadruby-d28d1a2e0a0162a3930f17e0181b0a0197291701.tar.gz
* lib/cgi/session.rb, lib/cgi/session/pstore.rb: suppress warnings.
fixed: [ruby-talk:204896] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cgi/session.rb')
-rw-r--r--lib/cgi/session.rb16
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 2bb6571bf6..d2a1be4aab 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -301,20 +301,14 @@ class CGI
# Retrieve the session data for key +key+.
def [](key)
- unless @data
- @data = @dbman.restore
- end
+ @data ||= @dbman.restore
@data[key]
end
# Set the session date for key +key+.
def []=(key, val)
- unless @write_lock
- @write_lock = true
- end
- unless @data
- @data = @dbman.restore
- end
+ @write_lock ||= true
+ @data ||= @dbman.restore
@data[key] = val
end
@@ -380,7 +374,9 @@ class CGI
require 'digest/md5'
md5 = Digest::MD5.hexdigest(id)[0,16]
@path = dir+"/"+prefix+md5+suffix
- unless File::exist? @path
+ if File::exist? @path
+ @hash = nil
+ else
unless session.new_session
raise CGI::Session::NoSession, "uninitialized session"
end