Fix DataSourceConfiguration isTestOnReturn()

Phillip Webb · Phillip Webb · commit c33f7e2c176a · 2013-08-22T02:37:14.000-07:00
Fix setTestOnReturn to use isTestOnReturn.
diff --git 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 DataSource dataSource() {
 		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;
 	}
diff --git 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 DataSource dataSource() {
 		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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public DataSource dataSource() {`
`54`	`54`	`this.pool.setMaxIdle(getMaxIdle());`
`55`	`55`	`this.pool.setMinIdle(getMinIdle());`
`56`	`56`	`this.pool.setTestOnBorrow(isTestOnBorrow());`
`57`		`- this.pool.setTestOnReturn(isTestOnBorrow());`
	`57`	`+ this.pool.setTestOnReturn(isTestOnReturn());`
`58`	`58`	`this.pool.setValidationQuery(getValidationQuery());`
`59`	`59`	`return this.pool;`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public DataSource dataSource() {`
`44`	`44`	`this.pool.setMaxIdle(getMaxIdle());`
`45`	`45`	`this.pool.setMinIdle(getMinIdle());`
`46`	`46`	`this.pool.setTestOnBorrow(isTestOnBorrow());`
`47`		`- this.pool.setTestOnReturn(isTestOnBorrow());`
	`47`	`+ this.pool.setTestOnReturn(isTestOnReturn());`
`48`	`48`	`this.pool.setValidationQuery(getValidationQuery());`
`49`	`49`	`return this.pool;`
`50`	`50`	`}`