* commit '6494eb90696eed4aa08fe0951371cb3c5e93a07d':
[maven-release-plugin] prepare release HikariCP-1.3.6
Update change log.
Remove chatty logging of connection failures, include "last" connection failure in SQL timeout exception.
Remove chatty logging of connection failures, include "last" connection failure in SQL timeout exception.
Break if we're failing to create connections and there is nobody waiting anymore.
merged
log pool name in warn messages
Do not set query timeout when user specifies connectionTimeout of 0.
Do not set query timeout when user specifies connectionTimeout of 0.
Small tweak to try to fix Javassist/Java8 incompatibility.
Fix Java8 JavaDoc errors.
@ -170,7 +172,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
while(timeout>0);
logPoolState("Timeout failure ");
thrownewSQLException(String.format("Timeout of %dms encountered waiting for connection.",configuration.getConnectionTimeout()));
thrownewSQLException(String.format("Timeout of %dms encountered waiting for connection.",configuration.getConnectionTimeout()), lastConnectionFailure.getAndSet(null));
}
catch(InterruptedExceptione)
{
@ -198,7 +200,8 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
}
else
{
LOGGER.debug("Connection returned to pool is broken, or the pool is shutting down. Closing connection.");
LOGGER.debug("Connection returned to pool {} is broken, or the pool is shutting down. Closing connection.",
configuration.getPoolName());
closeConnection(connectionProxy);
}
}
@ -249,6 +252,11 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener
LOGGER.warn("Connection {} marked as broken because of SQLSTATE({}), ErrorCode({}): {}",delegate.toString(),sqlState,sqle.getErrorCode(),sqle.getNextException());
LOGGER.warn("Connection {} ({}) marked as broken because of SQLSTATE({}), ErrorCode({}): {}",delegate.toString(),parentPool.toString(),sqle.getErrorCode(),sqle.getNextException());