You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/05/19 03:16:03 UTC
[shardingsphere] branch master updated: Fix sonar issue of `BitronixRecoveryResource` and `XATransactionDataSource` (#25777)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new d56c2b308ab Fix sonar issue of `BitronixRecoveryResource` and `XATransactionDataSource` (#25777)
d56c2b308ab is described below
commit d56c2b308abaabd9c0b24ce4f014b7f64d4ae165
Author: ZhangCheng <ch...@apache.org>
AuthorDate: Fri May 19 11:15:57 2023 +0800
Fix sonar issue of `BitronixRecoveryResource` and `XATransactionDataSource` (#25777)
---
.../transaction/xa/jta/datasource/XATransactionDataSource.java | 1 +
.../transaction/xa/bitronix/manager/BitronixRecoveryResource.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java
index 3284a410cc1..3c402f04a10 100644
--- a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java
+++ b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java
@@ -112,6 +112,7 @@ public final class XATransactionDataSource implements AutoCloseable {
} else {
xaTransactionManagerProvider.removeRecoveryResource(resourceName, xaDataSource);
}
+ enlistedTransactions.remove();
}
private void close(final DataSource dataSource) {
diff --git a/kernel/transaction/type/xa/provider/bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixRecoveryResource.java b/kernel/transaction/type/xa/provider/bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixRecoveryResource.java
index 55b5b97d558..f218ac8d844 100644
--- a/kernel/transaction/type/xa/provider/bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixRecoveryResource.java
+++ b/kernel/transaction/type/xa/provider/bitronix/src/main/java/org/apache/shardingsphere/transaction/xa/bitronix/manager/BitronixRecoveryResource.java
@@ -42,9 +42,9 @@ public final class BitronixRecoveryResource extends ResourceBean implements XARe
private final String resourceName;
- private final XADataSource xaDataSource;
+ private final transient XADataSource xaDataSource;
- private XAConnection xaConnection;
+ private transient XAConnection xaConnection;
@Override
public void init() {