Skip to content

Commit 9924243

Browse files
committed
keep werr up-to-date in Info
1 parent c1538a0 commit 9924243

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

internal/handler/handler.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ func (i *Info) callNilHandler() {
7979
}
8080
if i.NilHandler != nil {
8181
*i.Err = i.NilHandler(i.werr)
82+
i.werr = *i.Err // remember change both our errors!
8283
} else {
8384
i.defaultNilHandler()
8485
}
@@ -101,6 +102,7 @@ func (i *Info) callErrorHandler() {
101102
i.checkErrorTracer()
102103
if i.ErrorHandler != nil {
103104
*i.Err = i.ErrorHandler(i.Any.(error))
105+
i.werr = *i.Err // remember change both our errors!
104106
} else {
105107
i.defaultErrorHandler()
106108
}
@@ -254,6 +256,7 @@ func PreProcess(errPtr *error, info *Info, a ...any) error {
254256
// named return val. Reason is unknown.
255257
err := x.Whom(errPtr != nil, *errPtr, nil)
256258
info.Err = &err
259+
info.werr = *info.Err // remember change both our errors!
257260

258261
// We want the function who sets the handler, i.e. calls the
259262
// err2.Handle function via defer. Because call stack is in reverse

0 commit comments

Comments
 (0)