Properly reset the session on reset_session

Fixes rails#7478
steveklabnik · Aug 31, 2012 · 000edbb · reinh · Aug 31, 2012 · steveklabnik
1 parent c0b6963
commit 000edbb
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
@@ -227,8 +227,11 @@ def body_stream #:nodoc:
     # TODO This should be broken apart into AD::Request::Session and probably
     # be included by the session middleware.
     def reset_session
-      session.destroy if session && session.respond_to?(:destroy)
-      self.session = {}
+      if session && session.respond_to?(:destroy)
+        session.destroy
+      else
+        self.session = {}
+      end
       @env['action_dispatch.request.flash_hash'] = nil
     end