to get rid of "magic" time constants
This commit is contained in:
committed by
Juergen Hoeller
parent
ed7684d2b2
commit
407ecf7334
@@ -19,6 +19,7 @@ package org.springframework.jdbc.support;
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
@@ -108,7 +109,7 @@ public class DatabaseStartupValidator implements InitializingBean {
|
||||
try {
|
||||
boolean validated = false;
|
||||
long beginTime = System.currentTimeMillis();
|
||||
long deadLine = beginTime + this.timeout * 1000;
|
||||
long deadLine = beginTime + TimeUnit.SECONDS.toMillis(this.timeout);
|
||||
SQLException latestEx = null;
|
||||
|
||||
while (!validated && System.currentTimeMillis() < deadLine) {
|
||||
@@ -139,7 +140,7 @@ public class DatabaseStartupValidator implements InitializingBean {
|
||||
}
|
||||
|
||||
if (!validated) {
|
||||
Thread.sleep(this.interval * 1000);
|
||||
Thread.sleep(TimeUnit.SECONDS.toMillis(this.interval));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,7 +149,7 @@ public class DatabaseStartupValidator implements InitializingBean {
|
||||
"Database has not started up within " + this.timeout + " seconds", latestEx);
|
||||
}
|
||||
|
||||
float duration = (System.currentTimeMillis() - beginTime) / 1000;
|
||||
float duration = (System.currentTimeMillis() - beginTime)*1f / 1000;
|
||||
if (logger.isInfoEnabled()) {
|
||||
logger.info("Database startup detected after " + duration + " seconds");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user