From 0a84624bd78643f2161d162f68669de03fe2bac8 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 9 Sep 2006 00:11:12 +0000
Subject: Optimistic locking: raise ActiveResource::ResourceConflict on 409
 Conflict response.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5078 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activeresource/CHANGELOG | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'activeresource/CHANGELOG')

diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index ef3f3f6a17..c81f7daacb 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -1,5 +1,14 @@
 *SVN*
 
+* Optimistic locking: raise ActiveResource::ResourceConflict on 409 Conflict response. [Jeremy Kemper]
+
+    # Example controller action
+    def update
+      @person.save!
+    rescue ActiveRecord::StaleObjectError
+      render :xml => @person.reload.to_xml, :status => '409 Conflict'
+    end
+
 * Basic validation support [Rick Olson]
 
   Parses the xml response of ActiveRecord::Errors#to_xml with a similar interface to ActiveRecord::Errors.  
-- 
cgit v1.2.3