From d28d1a2e0a0162a3930f17e0181b0a0197291701 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 30 Jul 2006 14:06:50 +0000 Subject: * 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 --- lib/cgi/session.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'lib/cgi/session.rb') 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 -- cgit v1.2.3