Fix DataSourceConfiguration isTestOnReturn()

Fix setTestOnReturn to use isTestOnReturn.
11 years ago · d64a44547c
parent 621116c9b8
commit d64a44547c
2 changed files with 2 additions and 2 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/BasicDataSourceConfiguration.java
@ -54,7 +54,7 @@ public class BasicDataSourceConfiguration extends AbstractDataSourceConfiguratio
 		this.pool.setMaxIdle(getMaxIdle());
 		this.pool.setMinIdle(getMinIdle());
 		this.pool.setTestOnBorrow(isTestOnBorrow());
-		this.pool.setTestOnReturn(isTestOnBorrow());
+		this.pool.setTestOnReturn(isTestOnReturn());
 		this.pool.setValidationQuery(getValidationQuery());
 		return this.pool;
 	}
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfiguration.java
@ -44,7 +44,7 @@ public class TomcatDataSourceConfiguration extends AbstractDataSourceConfigurati
 		this.pool.setMaxIdle(getMaxIdle());
 		this.pool.setMinIdle(getMinIdle());
 		this.pool.setTestOnBorrow(isTestOnBorrow());
-		this.pool.setTestOnReturn(isTestOnBorrow());
+		this.pool.setTestOnReturn(isTestOnReturn());
 		this.pool.setValidationQuery(getValidationQuery());
 		return this.pool;
 	}