Remove double lock from Objects.Merge

lkarlslund · Apr 6, 2022 · 2ce094e · 2ce094e
1 parent e041a7d
commit 2ce094e
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/modules/engine/objects.go b/modules/engine/objects.go
@@ -253,9 +253,7 @@ func (os *Objects) addmerge(attrtomerge []Attribute, obs ...*Object) {
 
 // Attemps to merge the object into the objects
 func (os *Objects) Merge(attrtomerge []Attribute, o *Object) bool {
-	os.lock()
 	result := os.merge(attrtomerge, o)
-	os.unlock()
 	return result
 }