diff --git a/util/jsonutil/merge.go b/util/jsonutil/merge.go index e1d69cf1334..7900f78a4ff 100644 --- a/util/jsonutil/merge.go +++ b/util/jsonutil/merge.go @@ -30,12 +30,12 @@ func init() { // Fields of type json.RawMessage are merged rather than replaced. func MergeClone(v any, data json.RawMessage) error { err := jsonConfigMergeClone.Unmarshal(data, v) - if err != nil { - return &errortypes.FailedToUnmarshal{ - Message: tryExtractErrorMessage(err), - } + if err == nil { + return nil + } + return &errortypes.FailedToUnmarshal{ + Message: tryExtractErrorMessage(err), } - return err } type mergeCloneExtension struct {