@ -104,8 +104,7 @@ public class DatabaseStartupValidator implements InitializingBean {
@@ -104,8 +104,7 @@ public class DatabaseStartupValidator implements InitializingBean {
*/
@Override
publicvoidafterPropertiesSet(){
DataSourcedataSource=this.dataSource;
if(dataSource==null){
if(this.dataSource==null){
thrownewIllegalArgumentException("Property 'dataSource' is required");
}
if(this.validationQuery==null){
@ -122,10 +121,10 @@ public class DatabaseStartupValidator implements InitializingBean {
@@ -122,10 +121,10 @@ public class DatabaseStartupValidator implements InitializingBean {
Connectioncon=null;
Statementstmt=null;
try{
con=dataSource.getConnection();
con=this.dataSource.getConnection();
if(con==null){
thrownewCannotGetJdbcConnectionException("Failed to execute validation query: "+
"DataSource returned null from getConnection(): "+dataSource);
"DataSource returned null from getConnection(): "+this.dataSource);
}
stmt=con.createStatement();
stmt.execute(this.validationQuery);
@ -150,7 +149,7 @@ public class DatabaseStartupValidator implements InitializingBean {
@@ -150,7 +149,7 @@ public class DatabaseStartupValidator implements InitializingBean {