X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9861ca8001769b7cced2c8b5bcc0a87896f5439e..042388418411da6facdfe6ae590df6c17f85e88c:/app/models/trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index c189c035e..a2bebf1dd 100644
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -175,7 +175,12 @@ class Trace < ActiveRecord::Base
       f_lon = 0
       first = true
 
-      Tracepoint.delete_all(['gpx_id = ?', self.id])
+      # If there are any existing points for this trace then delete
+      # them - we check for existing points first to avoid locking
+      # the table in the common case where there aren't any.
+      if Tracepoint.exists?(['gpx_id = ?', self.id])
+        Tracepoint.delete_all(['gpx_id = ?', self.id])
+      end
 
       gpx.points do |point|
         if first