From 9aa5bb4bc4946a7fdcb8d017b92a88b27ddaf808 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 2 May 2012 17:54:08 -0700 Subject: extract options finding to a method --- .../lib/action_dispatch/middleware/session/abstract_store.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb index 550c0d8d71..134ca2dc5f 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -134,11 +134,14 @@ module ActionDispatch @exists = nil # we haven't checked yet end + def options + @env[ENV_SESSION_OPTIONS_KEY] + end + def destroy clear - options = @env[ENV_SESSION_OPTIONS_KEY] if @env - options ||= {} - @by.send(:destroy_session, @env, options[:id], options) if @by + options = self.options || {} + @by.send(:destroy_session, @env, options[:id], options) options[:id] = nil @loaded = false end @@ -219,7 +222,7 @@ module ActionDispatch def load! id, session = @by.load_session @env - @env[ENV_SESSION_OPTIONS_KEY][:id] = id + options[:id] = id @delegate.replace(stringify_keys(session)) @loaded = true end -- cgit v1.2.3