From 6186c4b90b41993bbe8b7b7036697103d218a979 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 20 Jul 2020 11:40:38 -0300 Subject: [PATCH] 16470: Fixes reload() API to match the overridden function. reload()'s documentation states: "...in addition to the in-place modification the method returns self for convenience." https://api.rubyonrails.org/v5.1.7/classes/ActiveRecord/Persistence.html#method-i-reload Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- services/api/app/models/arvados_model.rb | 1 + services/api/app/models/collection.rb | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb index 01a31adb91..80ea0c0b7f 100644 --- a/services/api/app/models/arvados_model.rb +++ b/services/api/app/models/arvados_model.rb @@ -137,6 +137,7 @@ class ArvadosModel < ApplicationRecord def reload(*args) super log_start_state + self end def self.create raw_params={}, *args diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb index 996981dba7..8f724e1f5f 100644 --- a/services/api/app/models/collection.rb +++ b/services/api/app/models/collection.rb @@ -262,8 +262,7 @@ class Collection < ArvadosModel # Put aside the changes because with_lock requires an explicit record reload changes = self.changes snapshot = nil - reload - with_lock do + reload.with_lock do # Copy the original state to save it as old version if should_preserve_version snapshot = self.dup -- 2.30.2