Fix race condition adding traces. Closes #1201.

[rails.git] / app / controllers / trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 899df05dfc021d1d683012bfbb8b995f42579d04..f0e1fe7cc3881cbc9295a92ffc61b9036124210c 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -306,10 +306,9 @@ private
     @trace.user = @user
     @trace.timestamp = Time.now
 
-    if @trace.save
-      FileUtils.mv(filename, @trace.trace_name)
-    else
-      FileUtils.rm_f(filename)
+    FileUtils.mv(filename, @trace.trace_name)
+    unless @trace.save
+      FileUtils.rm_f(@trace.trace_name)
     end
   end