Browse Source

Don't call setValidateConnectionOnBorrow on Oracle UCP datasource

See gh-37501
pull/37626/head
Sreekara Reddy 2 years ago committed by Moritz Halbritter
parent
commit
8fad59466c
  1. 1
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java
  2. 4
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java

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

@ -180,7 +180,6 @@ abstract class DataSourceConfiguration { @@ -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

@ -152,10 +152,10 @@ class DataSourceAutoConfigurationTests { @@ -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();
});

Loading…
Cancel
Save