You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/11/17 03:46:48 UTC
[shardingsphere] branch master updated: fix xa transaction get
connection bug (#8181)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 7e24741 fix xa transaction get connection bug (#8181)
7e24741 is described below
commit 7e247416a1a5815bddea162feeab4809b82bdac2
Author: xiaoyu <54...@qq.com>
AuthorDate: Tue Nov 17 11:46:21 2020 +0800
fix xa transaction get connection bug (#8181)
---
.../backend/communication/jdbc/datasource/JDBCBackendDataSource.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
index 543d5a1..795ea57 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.proxy.backend.communication.jdbc.datasource;
import com.google.common.base.Preconditions;
+import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.executor.sql.ConnectionMode;
import org.apache.shardingsphere.proxy.backend.communication.BackendDataSource;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -59,7 +60,8 @@ public final class JDBCBackendDataSource implements BackendDataSource {
* @throws SQLException SQL exception
*/
public List<Connection> getConnections(final String schemaName, final String dataSourceName, final int connectionSize, final ConnectionMode connectionMode) throws SQLException {
- return getConnections(schemaName, dataSourceName, connectionSize, connectionMode, TransactionType.LOCAL);
+ TransactionType transactionType = TransactionType.valueOf(ProxyContext.getInstance().getMetaDataContexts().getProps().getValue(ConfigurationPropertyKey.PROXY_TRANSACTION_TYPE));
+ return getConnections(schemaName, dataSourceName, connectionSize, connectionMode, transactionType);
}
/**