Added locking around update and delete methods on main API objects. This should remov...

[rails.git] / app / models / node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index e37a10250d06e07ea4310bfa7c95d5a28997ccbc..01b0f220e6ed565a1db167ea265d39f85b670ab2 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -130,6 +130,7 @@ class Node < ActiveRecord::Base
     # provide repeatable reads for the used-by checks. this means it
     # shouldn't be possible to get race conditions.
     Node.transaction do
     # provide repeatable reads for the used-by checks. this means it
     # shouldn't be possible to get race conditions.
     Node.transaction do

+      self.lock!

       check_consistency(self, new_node, user)
       way = WayNode.find(:first, :joins => :way, 
                          :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
       check_consistency(self, new_node, user)
       way = WayNode.find(:first, :joins => :way, 
                          :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])


@@ -150,25 +151,28 @@ class Node < ActiveRecord::Base
   end
 
   def update_from(new_node, user)
   end
 
   def update_from(new_node, user)

-    check_consistency(self, new_node, user)
-
-    # update changeset first
-    self.changeset_id = new_node.changeset_id
-    self.changeset = new_node.changeset
-
-    # update changeset bbox with *old* position first
-    changeset.update_bbox!(bbox);
-
-    # FIXME logic needs to be double checked
-    self.latitude = new_node.latitude 
-    self.longitude = new_node.longitude
-    self.tags = new_node.tags
-    self.visible = true
-
-    # update changeset bbox with *new* position
-    changeset.update_bbox!(bbox);
-
-    save_with_history!
+    Node.transaction do
+      self.lock!
+      check_consistency(self, new_node, user)
+      
+      # update changeset first
+      self.changeset_id = new_node.changeset_id
+      self.changeset = new_node.changeset
+      
+      # update changeset bbox with *old* position first
+      changeset.update_bbox!(bbox);
+      
+      # FIXME logic needs to be double checked
+      self.latitude = new_node.latitude 
+      self.longitude = new_node.longitude
+      self.tags = new_node.tags
+      self.visible = true
+      
+      # update changeset bbox with *new* position
+      changeset.update_bbox!(bbox);
+      
+      save_with_history!
+    end

   end
   
   def create_with_history(user)
   end
   
   def create_with_history(user)