Code-Fight commented on code in PR #849:
URL:
https://github.com/apache/incubator-seata-go/pull/849#discussion_r2217295168
##########
pkg/tm/transaction_executor.go:
##########
@@ -73,8 +73,17 @@ func WithGlobalTx(ctx context.Context, gc *GtxConfig,
business CallbackWithCtx)
}
}
- if re != nil || err != nil {
- re = fmt.Errorf("first phase error: %v, second phase
error: %v", re, err)
Review Comment:
The previous logs were lost.
##########
pkg/tm/transaction_executor.go:
##########
@@ -73,8 +73,17 @@ func WithGlobalTx(ctx context.Context, gc *GtxConfig,
business CallbackWithCtx)
}
}
- if re != nil || err != nil {
- re = fmt.Errorf("first phase error: %v, second phase
error: %v", re, err)
+ if re == nil && deferErr != nil {
+ // if deferErr is not an error, then convert it to error
+ // this is because panic may be caused by non-error
type e.g. panic("some string")
+ // so we need to convert it to error type
+ if _, ok := deferErr.(error); !ok {
+ deferErr = fmt.Errorf("%v", deferErr)
+ }
+ re = deferErr.(error)
+ }
+ if re == nil && err != nil {
+ re = err
}
Review Comment:
The code on lines 76 and 86 can be combined into a single conditional
statement to make the code more readable.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
