github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 09:00:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix AtomicError panic when Set nil (#1049) (#1050)

Browse Source
This commit is contained in:
NevS 2021-09-23 14:23:02 +08:00 committed by GitHub
parent 2e12cd2c99
commit 004ee488a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/errorx/atomicerror.go
View File

@ -9,7 +9,9 @@ type AtomicError struct {
// Set sets the error. // Set sets the error.
func (ae *AtomicError) Set(err error) { func (ae *AtomicError) Set(err error) {
ae.err.Store(err) if err != nil {
ae.err.Store(err)
}
} }
// Load returns the error. // Load returns the error.

9
core/errorx/atomicerror_test.go
View File

@ -17,6 +17,15 @@ func TestAtomicError(t *testing.T) {
assert.Equal(t, errDummy, err.Load()) assert.Equal(t, errDummy, err.Load())
} }
func TestAtomicErrorSetNil(t *testing.T) {
var (
errNil error
err AtomicError
)
err.Set(errNil)
assert.Equal(t, errNil, err.Load())
}
func TestAtomicErrorNil(t *testing.T) { func TestAtomicErrorNil(t *testing.T) {
var err AtomicError var err AtomicError
assert.Nil(t, err.Load()) assert.Nil(t, err.Load())