Changeset 1710

Timestamp:

07/05/05 14:50:07 (3 years ago)

Author:

bitsweat

Message:

r2850@asus: jeremy | 2005-07-05 13:08:32 -0700
Don't be strict about the order in which AR store methods are called. Allow e.g. session close followed by session close.

Files:

• trunk/actionpack/lib/action_controller/session/active_record_store.rb (modified) (1 diff)
• trunk/actionpack/test/controller/active_record_store_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/session/active_record_store.rb

@@ -252 +252 @@
-      # Restore session state.  The session model handles unmarshaling.
-      def restore
-
+ if @session
-      end
-
-      # Save session store.
-      def update
-
+ if @session
-      end
-
-      # Save and close the session store.
-      def close
-
-
+
+
+
+
-      end
-
-      # Delete and close the session store.
-      def delete
-
-
+
+
+
+
-      end
-    end

trunk/actionpack/test/controller/active_record_store_test.rb

@@ -40 +40 @@
-    reloaded = CGI::Session.new(CGI.new, 'session_id' => @new_session.session_id, 'database_manager' => CGI::Session::ActiveRecordStore)
-    assert_equal 'bar', reloaded['foo']
+  end
+
+  def test_tolerates_close_close
+    assert_nothing_raised do
+      @new_session.close
+      @new_session.close
+    end
-  end
-end