X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/891ec3d75cdb93a97759c2311ad8e1b559421280..cf6a5c17ee15eeee6035b7c99996b411f08cc9c1:/app/models/relation.rb

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 3d3c317aa..cb9621822 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -246,8 +246,10 @@ class Relation < ActiveRecord::Base
 
       # use reflection to look up the appropriate class
       model = Kernel.const_get(m[0].capitalize)
-      # get the element with that ID
-      element = model.find_by(:id => m[1])
+      # get the element with that ID. and, if found, lock the element to
+      # ensure it can't be deleted until after the current transaction
+      # commits.
+      element = model.lock("for share").find_by(:id => m[1])
 
       # and check that it is OK to use.
       unless element && element.visible? && element.preconditions_ok?