Permalink
Browse files

Retract the session fix until 0.13.1 to preserve the truthfulness of …

…the book

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1730 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2186ed8 commit 744058b6997edbd323e888e19e58d6573eb60ddf @dhh dhh committed Jul 6, 2005
Showing with 23 additions and 16 deletions.
  1. +23 −16 actionpack/lib/action_controller/cgi_process.rb
@@ -95,22 +95,29 @@ def session
@session["__valid_session"]
return @session
rescue ArgumentError => e
- 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
+ # TODO: Uncomment this on 0.13.1
+ # 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
+ 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
end

0 comments on commit 744058b

Please sign in to comment.