X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3371ca37f1728d6e37202ceff9bd968688f59a8a..7f05783949ce561d58904da133efd37438ebffe8:/app/models/way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index 98c4902f9..9877b8bb8 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -255,6 +255,9 @@ class Way < ActiveRecord::Base
   def save_with_history!
     t = Time.now.getutc
 
+    self.version += 1
+    self.timestamp = t
+
     # update the bounding box, note that this has to be done both before
     # and after the save, so that nodes from both versions are included in the
     # bbox. we use a copy of the changeset so that it isn't reloaded
@@ -263,9 +266,9 @@ class Way < ActiveRecord::Base
     cs.update_bbox!(bbox) unless nodes.empty?
 
     Way.transaction do
-      self.version += 1
-      self.timestamp = t
-      save!
+      # clone the object before saving it so that the original is
+      # still marked as dirty if we retry the transaction
+      clone.save!
 
       tags = self.tags
       WayTag.delete_all(:way_id => id)