Skip to content

S
spring-boot
Commit d64a4454 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Fix DataSourceConfiguration isTestOnReturn() 

Fix setTestOnReturn to use isTestOnReturn.
parent 621116c9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfiguration.java
View file @ d64a4454
...@@ -54,7 +54,7 @@ public class BasicDataSourceConfiguration extends AbstractDataSourceConfiguratio ...@@ -54,7 +54,7 @@ public class BasicDataSourceConfiguration extends AbstractDataSourceConfiguratio
this.pool.setMaxIdle(getMaxIdle()); this.pool.setMaxIdle(getMaxIdle());
this.pool.setMinIdle(getMinIdle()); this.pool.setMinIdle(getMinIdle());
this.pool.setTestOnBorrow(isTestOnBorrow()); this.pool.setTestOnBorrow(isTestOnBorrow());
this.pool.setTestOnReturn(isTestOnBorrow()); this.pool.setTestOnReturn(isTestOnReturn());
this.pool.setValidationQuery(getValidationQuery()); this.pool.setValidationQuery(getValidationQuery());
return this.pool; return this.pool;
} }
......
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
View file @ d64a4454
...@@ -44,7 +44,7 @@ public class TomcatDataSourceConfiguration extends AbstractDataSourceConfigurati ...@@ -44,7 +44,7 @@ public class TomcatDataSourceConfiguration extends AbstractDataSourceConfigurati
this.pool.setMaxIdle(getMaxIdle()); this.pool.setMaxIdle(getMaxIdle());
this.pool.setMinIdle(getMinIdle()); this.pool.setMinIdle(getMinIdle());
this.pool.setTestOnBorrow(isTestOnBorrow()); this.pool.setTestOnBorrow(isTestOnBorrow());
this.pool.setTestOnReturn(isTestOnBorrow()); this.pool.setTestOnReturn(isTestOnReturn());
this.pool.setValidationQuery(getValidationQuery()); this.pool.setValidationQuery(getValidationQuery());
return this.pool; return this.pool;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment