Skip to content

Commit

Permalink
Fixes brettwooldridge#1126 correct error in JavaDoc for HikariConfig.…
Browse files Browse the repository at this point in the history
…setInitializationFailTimeout().
  • Loading branch information
brettwooldridge authored and kollstrom committed Feb 4, 2021
1 parent 89216d4 commit fe2337c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/main/java/com/zaxxer/hikari/HikariConfig.java
Expand Up @@ -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. </li>
* <li>A value less than zero will <i>not</i> 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. </li>
* <li>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. </li>
* </ul>
* 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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit fe2337c

Please sign in to comment.