swallow error when can't unmarshall object from session

Signed-off-by: José Valim <jose.valim@gmail.com>
rails · Oct 12, 2011 · 4d986c4 · 4d986c4
1 parent 86a5271
commit 4d986c4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -62,6 +62,9 @@ def stale_session_check!
             raise ActionDispatch::Session::SessionRestoreError, "Session contains objects whose class definition isn't available.\nRemember to require the classes for all objects kept in the session.\n(Original exception: #{const_error.message} [#{const_error.class}])\n"
           end
           retry
+        elsif argument_error.message =~ %r{dump format error \(user class\)}
+          # Error unmarshalling object from session.
+          {}
         else
           raise
         end