From 4df29bc674b094f7201987685b8ae80f9cab8dcf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 02:56:51 +0000 Subject: [PATCH 1/4] Initial plan From 586d7a4c339795dd6790f8787afa41b7234df2d2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 02:59:02 +0000 Subject: [PATCH 2/4] Fix NPE in ConnectionFactory.notify() when connectionProxyMap is null Co-authored-by: huayanYu <16700837+huayanYu@users.noreply.github.com> --- .../common/v3/DsTransactionalTest.java | 13 ++++ .../datasource/tx/ConnectionFactory.java | 3 + .../tx/NonDatabaseConnectionService.java | 76 +++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NonDatabaseConnectionService.java diff --git a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/common/v3/DsTransactionalTest.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/common/v3/DsTransactionalTest.java index ead12456..54887507 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/common/v3/DsTransactionalTest.java +++ b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/common/v3/DsTransactionalTest.java @@ -45,6 +45,8 @@ public class DsTransactionalTest { private AccountService accountService; @Autowired private ProductService productService; + @Autowired + private NonDatabaseConnectionService nonDatabaseConnectionService; private DynamicRoutingDataSource ds; @Test @@ -84,6 +86,17 @@ public void testDsTransactional() { assertThat(productService.selectProduct()).isEqualTo(new Product(1, 10.0, 15)); } + @Test + public void testRequiredWithRequiresNewNoConnection() { + // Setup datasources + DataSourceProperty orderDataSourceProperty = createDataSourceProperty("order"); + ds = (DynamicRoutingDataSource) dataSource; + ds.addDataSource(orderDataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(orderDataSourceProperty)); + + // This should not throw NPE even though the inner REQUIRES_NEW transaction has no JDBC connections + nonDatabaseConnectionService.outerRequiredWithConnection(); + } + private DataSourceProperty createDataSourceProperty(String poolName) { DataSourceProperty result = new DataSourceProperty(); result.setPoolName(poolName); diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java index 0248639d..c2c41dcd 100644 --- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java +++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java @@ -109,6 +109,9 @@ public static void notify(String xid, Boolean state) throws Exception { boolean hasSavepoint = hasSavepoint(xid); List savePointHolders = savePointMap.get(xid); Map connectionProxyMap = concurrentHashMap.get(xid); + if (connectionProxyMap == null) { + return; + } try { //If there is a savepoint,Indicates a nested transaction. if (hasSavepoint) { diff --git a/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NonDatabaseConnectionService.java b/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NonDatabaseConnectionService.java new file mode 100644 index 00000000..363076dd --- /dev/null +++ b/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NonDatabaseConnectionService.java @@ -0,0 +1,76 @@ +/* + * Copyright © 2018 organization baomidou + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.baomidou.dynamic.datasource.common.service.tx; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; +import com.baomidou.dynamic.datasource.tx.DsPropagation; +import org.springframework.aop.framework.AopContext; +import org.springframework.stereotype.Service; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; + +/** + * Test service to reproduce the NPE issue when REQUIRES_NEW has no JDBC connections + */ +@Service +@DS("order") +public class NonDatabaseConnectionService { + private final DataSource dataSource; + + public NonDatabaseConnectionService(DataSource dataSource) { + this.dataSource = dataSource; + } + + /** + * Outer REQUIRED transaction with JDBC connection + */ + @DSTransactional(propagation = DsPropagation.REQUIRED) + public void outerRequiredWithConnection() { + // Trigger JDBC connection + triggerJdbcConnection(); + // Call nested REQUIRES_NEW without JDBC connection + ((NonDatabaseConnectionService) AopContext.currentProxy()).innerRequiresNewWithoutConnection(); + } + + /** + * Inner REQUIRES_NEW transaction without JDBC connection + * This should not throw NPE when committing + */ + @DSTransactional(propagation = DsPropagation.REQUIRES_NEW) + public void innerRequiresNewWithoutConnection() { + // No database operations - just business logic + System.out.println("Business logic without database operations"); + } + + /** + * Trigger a JDBC connection + */ + private void triggerJdbcConnection() { + try (Connection connection = dataSource.getConnection(); + Statement statement = connection.createStatement(); + ResultSet resultSet = statement.executeQuery("SELECT COUNT(*) FROM p_order")) { + if (resultSet.next()) { + resultSet.getInt(1); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} From 743a2e578a7238bd2a028b0903d0dd694dd2b54e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 03:01:59 +0000 Subject: [PATCH 3/4] Add test for REQUIRED with nested REQUIRES_NEW without JDBC connections Co-authored-by: huayanYu <16700837+huayanYu@users.noreply.github.com> --- .../service/tx/NoConnectionService.java | 39 +++++++++++++++++++ .../tx/NonDatabaseConnectionService.java | 17 ++------ 2 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NoConnectionService.java diff --git a/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NoConnectionService.java b/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NoConnectionService.java new file mode 100644 index 00000000..f08b6d13 --- /dev/null +++ b/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NoConnectionService.java @@ -0,0 +1,39 @@ +/* + * Copyright © 2018 organization baomidou + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.baomidou.dynamic.datasource.common.service.tx; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; +import com.baomidou.dynamic.datasource.tx.DsPropagation; +import org.springframework.stereotype.Service; + +/** + * Service with REQUIRES_NEW transaction but no JDBC connections + */ +@Service +@DS("order") +public class NoConnectionService { + + /** + * Inner REQUIRES_NEW transaction without JDBC connection + * This should not throw NPE when committing + */ + @DSTransactional(propagation = DsPropagation.REQUIRES_NEW) + public void innerRequiresNewWithoutConnection() { + // No database operations - just business logic + System.out.println("Business logic without database operations"); + } +} diff --git a/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NonDatabaseConnectionService.java b/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NonDatabaseConnectionService.java index 363076dd..c9fd0dd6 100644 --- a/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NonDatabaseConnectionService.java +++ b/dynamic-datasource-test-common/src/main/java/com/baomidou/dynamic/datasource/common/service/tx/NonDatabaseConnectionService.java @@ -18,7 +18,6 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.baomidou.dynamic.datasource.tx.DsPropagation; -import org.springframework.aop.framework.AopContext; import org.springframework.stereotype.Service; import javax.sql.DataSource; @@ -33,9 +32,11 @@ @DS("order") public class NonDatabaseConnectionService { private final DataSource dataSource; + private final NoConnectionService noConnectionService; - public NonDatabaseConnectionService(DataSource dataSource) { + public NonDatabaseConnectionService(DataSource dataSource, NoConnectionService noConnectionService) { this.dataSource = dataSource; + this.noConnectionService = noConnectionService; } /** @@ -46,17 +47,7 @@ public void outerRequiredWithConnection() { // Trigger JDBC connection triggerJdbcConnection(); // Call nested REQUIRES_NEW without JDBC connection - ((NonDatabaseConnectionService) AopContext.currentProxy()).innerRequiresNewWithoutConnection(); - } - - /** - * Inner REQUIRES_NEW transaction without JDBC connection - * This should not throw NPE when committing - */ - @DSTransactional(propagation = DsPropagation.REQUIRES_NEW) - public void innerRequiresNewWithoutConnection() { - // No database operations - just business logic - System.out.println("Business logic without database operations"); + noConnectionService.innerRequiresNewWithoutConnection(); } /** From bcdea02207865ce6b65d44ac0a11ac67c41a5d79 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 03:03:27 +0000 Subject: [PATCH 4/4] Fix test to avoid duplicate datasource creation Co-authored-by: huayanYu <16700837+huayanYu@users.noreply.github.com> --- .../dynamic/datasource/common/v3/DsTransactionalTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/common/v3/DsTransactionalTest.java b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/common/v3/DsTransactionalTest.java index 54887507..43a9bcc7 100644 --- a/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/common/v3/DsTransactionalTest.java +++ b/dynamic-datasource-spring-boot3-starter/src/test/java/com/baomidou/dynamic/datasource/common/v3/DsTransactionalTest.java @@ -89,9 +89,11 @@ public void testDsTransactional() { @Test public void testRequiredWithRequiresNewNoConnection() { // Setup datasources - DataSourceProperty orderDataSourceProperty = createDataSourceProperty("order"); ds = (DynamicRoutingDataSource) dataSource; - ds.addDataSource(orderDataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(orderDataSourceProperty)); + if (!ds.getDataSources().containsKey("order")) { + DataSourceProperty orderDataSourceProperty = createDataSourceProperty("order"); + ds.addDataSource(orderDataSourceProperty.getPoolName(), dataSourceCreator.createDataSource(orderDataSourceProperty)); + } // This should not throw NPE even though the inner REQUIRES_NEW transaction has no JDBC connections nonDatabaseConnectionService.outerRequiredWithConnection();