@@ -54,11 +54,12 @@ module Rack @mutex.synchronize do old_session = @pool[sid] old_session[:expire_at] = expiry if expiry - (@pool[sid] = old_session.merge(env['rack.session'])).each{|k,v| - if old_session.has_key?(k) and v != old_session[k] - warn "session collision at #{k}: #{old_session[k]} <- #{v}" - end - } + session = old_session.merge(env['rack.session']) + @pool[sid] = session + session.each do |k,v| + next unless old_session.has_key?(k) and v != old_session[k] + warn "session value assignment collision at #{k}: #{old_session[k]} <- #{v}" + end if $DEBUG and env['rack.multithread'] end end end lib/rack/session/pool.rb 2b31124705fc180742833aa607710cbf1899ca2e Scytrin dai Kinthra scytrin@gmail.com http://github.com/chneukirchen/rack-mirror/commit/23ceadbcb37cc38752b10055a52c9931f407455e 23ceadbcb37cc38752b10055a52c9931f407455e 2008-03-17T08:59:00-07:00 2008-03-17T08:59:00-07:00 pool.rb - cleanup of session merging and threading collision checks darcs-hash:20080317155913-f4dbf-5f31b6d941dba8de9a2a546e645ece5b63d817ce.gz 6dfba218f59e9dc2a6abc8ed5408697483ef21b7 Scytrin dai Kinthra scytrin@gmail.com