Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: fix can't rollback when set rollback retry count was zero. #2777

Merged
merged 9 commits into from
Jun 9, 2020
Merged

bugfix: fix can't rollback when set rollback retry count was zero. #2777

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
db0f50a
fix could not rollback when set rollback retry count was zero.
l81893521 Jun 8, 2020
60d95ee
Merge branch 'develop' into fix_rollback_retry_count_zero
l81893521 Jun 8, 2020
ee25aa5
fix could not commit when set commit retry count was zero.
l81893521 Jun 8, 2020
581fb80
Merge remote-tracking branch 'me/fix_rollback_retry_count_zero' into …
l81893521 Jun 8, 2020
a9efaa6
Merge branch 'develop' into fix_rollback_retry_count_zero
slievrly Jun 8, 2020
951854f
fix issue
l81893521 Jun 8, 2020
a1a87f8
Merge remote-tracking branch 'me/fix_rollback_retry_count_zero' into …
l81893521 Jun 8, 2020
06c9311
fix ci.
l81893521 Jun 8, 2020
6ff8f7e
disable unit test
l81893521 Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tm/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void commit() throws TransactionException {
return;
}
assertXIDNotNull();
int retry = COMMIT_RETRY_COUNT;
int retry = COMMIT_RETRY_COUNT <= 0 ? 1 : COMMIT_RETRY_COUNT;;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it better to use the default value when <=0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

try {
while (retry > 0) {
try {
Expand Down Expand Up @@ -156,7 +156,7 @@ public void rollback() throws TransactionException {
}
assertXIDNotNull();

int retry = ROLLBACK_RETRY_COUNT;
int retry = ROLLBACK_RETRY_COUNT <= 0 ? 1 : ROLLBACK_RETRY_COUNT;
try {
while (retry > 0) {
try {
Expand Down