aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-03-10 14:41:37 +0000
committerJamis Buck <jamis@37signals.com>2006-03-10 14:41:37 +0000
commitbfbbd4c346eb6f91505f64d9f437ee32f4540d03 (patch)
tree0e014990299f520cae5e4b762af39581dfc6a059 /actionpack
parentffec8c6b0099885f655190e659dab9cde66b13a7 (diff)
downloadrails-bfbbd4c346eb6f91505f64d9f437ee32f4540d03.tar.gz
rails-bfbbd4c346eb6f91505f64d9f437ee32f4540d03.tar.bz2
rails-bfbbd4c346eb6f91505f64d9f437ee32f4540d03.zip
make sure nil @session doesn't mess up wsod stacktraces
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3834 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/flash.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb
index 446bab5dc9..5a50d39efc 100644
--- a/actionpack/lib/action_controller/flash.rb
+++ b/actionpack/lib/action_controller/flash.rb
@@ -143,7 +143,7 @@ module ActionController #:nodoc:
end
def process_cleanup_with_flash
- flash.sweep
+ flash.sweep if @session
process_cleanup_without_flash
end