From 8dbaae6012c8aa71c811eb42e7a7ac32a36e2080 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 6 Jul 2005 07:06:02 +0000 Subject: Fixed that a SessionRestoreError was thrown if a model object was placed in the session that wasn't available to all controllers git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1725 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/cgi_process.rb | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index be37fa6dd8..2f31073055 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -89,18 +89,28 @@ module ActionController #:nodoc: def session return @session unless @session.nil? + begin @session = (@session_options == false ? {} : CGI::Session.new(@cgi, session_options_with_string_keys)) @session["__valid_session"] return @session rescue ArgumentError => e - @session.delete if @session - raise( - ActionController::SessionRestoreError, - "Session contained objects where the class definition wasn't available. " + - "Remember to require classes for all objects kept in the session. " + - "The session has been deleted. (Original exception: #{e.message} [#{e.class}])" - ) + if e.message =~ %r{undefined class/module (\w+)} + begin + Module.const_missing($1) + rescue LoadError, NameError => e + raise( + ActionController::SessionRestoreError, + "Session contained objects where the class definition wasn't available. " + + "Remember to require classes for all objects kept in the session. " + + "(Original exception: #{e.message} [#{e.class}])" + ) + end + + retry + else + raise + end end end -- cgit v1.2.3