root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Polish DatabaseStartupValidator.afterPropertiesSet()

This commit is contained in:
Johnny Lim 2018-07-26 22:21:56 +09:00 committed by Juergen Hoeller
parent e458777925
commit 964467d269
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
View File

@ -104,8 +104,7 @@ public class DatabaseStartupValidator implements InitializingBean {
*/ */
@Override @Override
public void afterPropertiesSet() { public void afterPropertiesSet() {
DataSource dataSource = this.dataSource; if (this.dataSource == null) {
if (dataSource == null) {
throw new IllegalArgumentException("Property 'dataSource' is required"); throw new IllegalArgumentException("Property 'dataSource' is required");
} }
if (this.validationQuery == null) { if (this.validationQuery == null) {
@ -122,10 +121,10 @@ public class DatabaseStartupValidator implements InitializingBean {
Connection con = null; Connection con = null;
Statement stmt = null; Statement stmt = null;
try { try {
con = dataSource.getConnection(); con = this.dataSource.getConnection();
if (con == null) { if (con == null) {
throw new CannotGetJdbcConnectionException("Failed to execute validation query: " + throw new CannotGetJdbcConnectionException("Failed to execute validation query: " +
"DataSource returned null from getConnection(): " + dataSource); "DataSource returned null from getConnection(): " + this.dataSource);
} }
stmt = con.createStatement(); stmt = con.createStatement();
stmt.execute(this.validationQuery); stmt.execute(this.validationQuery);
@ -150,7 +149,7 @@ public class DatabaseStartupValidator implements InitializingBean {
} }
if (!validated) { if (!validated) {
Thread.sleep(TimeUnit.SECONDS.toMillis(this.interval)); TimeUnit.SECONDS.sleep(this.interval);
} }
} }