From 09a041be14b9baa97f3f9392f36c722572ffa11c Mon Sep 17 00:00:00 2001 From: Ying Li Date: Tue, 13 Oct 2015 16:18:59 -0700 Subject: [PATCH] Use more idiomatic go in if conditions. Signed-off-by: Ying Li --- server/storage/database.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/storage/database.go b/server/storage/database.go index 34f4c417bf..c28ab16a5e 100644 --- a/server/storage/database.go +++ b/server/storage/database.go @@ -53,11 +53,11 @@ func (db *SQLStorage) UpdateMany(gun string, updates []MetaUpdate) error { } rollback := func(err error) error { - query := tx.Rollback() - if query.Error != nil { + if rxErr := tx.Rollback().Error; rxErr != nil { logrus.Error("Failed on Tx rollback with error: ", err.Error()) + return rxErr } - return query.Error + return err } var ( @@ -88,7 +88,7 @@ func (db *SQLStorage) UpdateMany(gun string, updates []MetaUpdate) error { } // it's previously been added, which means it's a duplicate entry // in the same transaction - if added[row.ID] { + if _, ok := added[row.ID]; ok { return rollback(&ErrOldVersion{}) } added[row.ID] = true