revert conditionals to master

tenderlove · tenderlove · commit 73a5f79f6854 · 2019-12-17T09:54:34.000-08:00
diff --git a/lib/rack/session/abstract/id.rb b/lib/rack/session/abstract/id.rb
@@ -372,7 +372,7 @@ def commit_session(req, res)
 
           if options[:drop] || options[:renew]
             session_id = delete_session(req, session.id || generate_sid, options)
-            return if session_id.nil?
+            return unless session_id
           end
 
           return unless commit_session?(req, 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 find_session(req, sid)
         with_lock(req) 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
