aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-09-28 18:01:48 -0300
committerEmilio Tagua <miloops@gmail.com>2010-09-28 18:01:48 -0300
commit523f98099d331908db6ab4c45f7657e61a8a4d5f (patch)
tree73c55e2d365e4b231c65855e189a11f387ca8234 /actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
parentad2c21089e435527641d891a30ff8f695114071b (diff)
downloadrails-523f98099d331908db6ab4c45f7657e61a8a4d5f.tar.gz
rails-523f98099d331908db6ab4c45f7657e61a8a4d5f.tar.bz2
rails-523f98099d331908db6ab4c45f7657e61a8a4d5f.zip
Remove more warnings on AP.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/session/abstract_store.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/abstract_store.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 348a2d1eb2..ea49b30630 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -102,8 +102,8 @@ module ActionDispatch
def destroy
clear
- @by.send(:destroy, @env) if @by
- @env[ENV_SESSION_OPTIONS_KEY][:id] = nil if @env && @env[ENV_SESSION_OPTIONS_KEY]
+ @by.send(:destroy, @env) if defined?(@by) && @by
+ @env[ENV_SESSION_OPTIONS_KEY][:id] = nil if defined?(@env) && @env && @env[ENV_SESSION_OPTIONS_KEY]
@loaded = false
end