revert conditionals to master

rack · Dec 17, 2019 · 368effd · 368effd
1 parent d49aa81
commit 368effd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/rack/session/abstract/id.rb b/lib/rack/session/abstract/id.rb
@@ -9,6 +9,7 @@
 rescue LoadError
   # We just won't get securerandom
 end
+require "digest/sha2"
 
 module Rack
 
@@ -360,7 +361,7 @@ def commit_session(env, status, headers, body)
 
           if options[:drop] || options[:renew]
             session_id = destroy_session(env, session.id || generate_sid, options)
-            return if session_id.nil?
+            return unless session_id
           end
 
           return [status, headers, body] unless commit_session?(env, session, options)

diff --git a/lib/rack/session/memcache.rb b/lib/rack/session/memcache.rb
@@ -48,7 +48,7 @@ def generate_sid
 
       def get_session(env, sid)
         with_lock(env) do
-          unless !sid.nil? and session = @pool.get(sid.private_id)
+          unless sid and session = @pool.get(sid.private_id)
             sid, session = generate_sid, {}
             unless /^STORED/ =~ @pool.add(sid.private_id, session)
               raise "Session collision on '#{sid.inspect}'"

diff --git a/lib/rack/session/pool.rb b/lib/rack/session/pool.rb
@@ -43,7 +43,7 @@ def generate_sid
 
       def get_session(env, sid)
         with_lock(env) do
-          unless !sid.nil? and session = @pool[sid.private_id]
+          unless sid and session = @pool[sid.private_id]
             sid, session = generate_sid, {}
             @pool.store sid.private_id, session
           end