Allow ActionController::Base.session_store to lazily load the session class to allow for custom session store plugins. [Rick Olson]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5833 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/session_management.rb b/actionpack/lib/action_controller/session_management.rb
index 60b0cd5f94..95c5ea7336 100644
--- a/actionpack/lib/action_controller/session_management.rb
+++ b/actionpack/lib/action_controller/session_management.rb
@@ -18,13 +18,13 @@ module ActionController #:nodoc:
       # file system, but you can also specify one of the other included stores (:active_record_store, :drb_store, 
       # :mem_cache_store, or :memory_store) or use your own class.
       def session_store=(store)
-        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] =
-          store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
+        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] = store
       end
 
       # Returns the session store class currently used.
       def session_store
-        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
+        store = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
+        self.session_store = store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
       end
 
       # Returns the hash used to configure the session. Example use: