From bdcf450203b70c05d748c605fbf9df9c47c98b2c Mon Sep 17 00:00:00 2001 From: foxxorcat <95907542+foxxorcat@users.noreply.github.com> Date: Mon, 27 Jan 2025 20:06:18 +0800 Subject: [PATCH] fix: resolve concurrent read/write issues in WrapObjName (#7865) --- internal/model/obj.go | 4 ++-- internal/model/object.go | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/internal/model/obj.go b/internal/model/obj.go index 2a72ca9e..552b1241 100644 --- a/internal/model/obj.go +++ b/internal/model/obj.go @@ -115,12 +115,12 @@ func ExtractFolder(objs []Obj, extractFolder string) { } func WrapObjName(objs Obj) Obj { - return &ObjWrapName{Obj: objs} + return &ObjWrapName{Name: utils.MappingName(objs.GetName()), Obj: objs} } func WrapObjsName(objs []Obj) { for i := 0; i < len(objs); i++ { - objs[i] = &ObjWrapName{Obj: objs[i]} + objs[i] = &ObjWrapName{Name: utils.MappingName(objs[i].GetName()), Obj: objs[i]} } } diff --git a/internal/model/object.go b/internal/model/object.go index 93f2c307..c8c10bb9 100644 --- a/internal/model/object.go +++ b/internal/model/object.go @@ -16,9 +16,6 @@ func (o *ObjWrapName) Unwrap() Obj { } func (o *ObjWrapName) GetName() string { - if o.Name == "" { - o.Name = utils.MappingName(o.Obj.GetName()) - } return o.Name }