Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't call setValidateConnectionOnBorrow on Oracle UCP datasource

Browse Source 
See gh-37501
This commit is contained in:
Sreekara Reddy
2023-09-21 03:29:47 +05:30
committed by Moritz Halbritter
parent 40d4c177cd
commit 8fad59466c
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java
View File

@@ -180,7 +180,6 @@ abstract class DataSourceConfiguration {
throws SQLException {
PoolDataSourceImpl dataSource = createDataSource(connectionDetails, PoolDataSourceImpl.class,
properties.getClassLoader());
dataSource.setValidateConnectionOnBorrow(true);
if (StringUtils.hasText(properties.getName())) {
dataSource.setConnectionPoolName(properties.getName());
}

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
View File

@@ -152,10 +152,10 @@ class DataSourceAutoConfigurationTests {
}
@Test
void oracleUcpValidatesConnectionByDefault() {
void oracleUcpDoesNotValidateConnectionByDefault() {
assertDataSource(PoolDataSourceImpl.class,
Arrays.asList("com.zaxxer.hikari", "org.apache.tomcat", "org.apache.commons.dbcp2"), (dataSource) -> {
assertThat(dataSource.getValidateConnectionOnBorrow()).isTrue();
assertThat(dataSource.getValidateConnectionOnBorrow()).isFalse();
// Use an internal ping when using an Oracle JDBC driver
assertThat(dataSource.getSQLForValidateConnection()).isNull();
});