From 603951febd167ce086c2a65ace1668cf8488db5e Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Sat, 19 May 2018 18:29:50 +0900 Subject: [PATCH] Fixes #1126 correct error in JavaDoc for HikariConfig.setInitializationFailTimeout(). --- src/main/java/com/zaxxer/hikari/HikariConfig.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/HikariConfig.java b/src/main/java/com/zaxxer/hikari/HikariConfig.java index 6b45baf05..df8f51aaa 100644 --- a/src/main/java/com/zaxxer/hikari/HikariConfig.java +++ b/src/main/java/com/zaxxer/hikari/HikariConfig.java @@ -591,10 +591,10 @@ public long getInitializationFailTimeout() * and the the pool will start and continue to try to obtain connections in the * background. This can mean that callers to {@code DataSource#getConnection()} may * encounter exceptions. - *
  • A value less than zero will not bypass any connection attempt and - * validation during startup, and therefore the pool will start immediately. The - * pool will continue to try to obtain connections in the background. This can mean - * that callers to {@code DataSource#getConnection()} may encounter exceptions.
  • + *
  • A value less than zero will bypass any connection attempt and validation during + * startup, and therefore the pool will start immediately. The pool will continue to + * try to obtain connections in the background. This can mean that callers to + * {@code DataSource#getConnection()} may encounter exceptions.
  • * * Note that if this timeout value is greater than or equal to zero (0), and therefore an * initial connection validation is performed, this timeout does not override the @@ -916,6 +916,7 @@ else if (isRegisterMbeans && poolName.contains(":")) { } // treat empty property as null + //noinspection NonAtomicOperationOnVolatileField catalog = getNullIfEmpty(catalog); connectionInitSql = getNullIfEmpty(connectionInitSql); connectionTestQuery = getNullIfEmpty(connectionTestQuery);