Merge branch '2.2.5-rc1' into dev

* 2.2.5-rc1: [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release HikariCP-2.2.5 Update changes log. Prepare release.
10 years ago · a9ea4fc476
parent 29629e5468 aa7aa20544
commit a9ea4fc476
1 changed files with 5 additions and 0 deletions
--- a/5
+++ b/5
@ -21,6 +21,11 @@ Changes in 2.2.5

 * Fix a bug where DataSource.loginTimeout() was always being set to 1 second.
 
+ * Fix bug where some drivers return 0 from Connection.getNetworkTimeout(),
+   and yet throw SQLFeatureNotSupportedException when setNetworkTimeout() is
+   called. This broke they way that HikariCP had implemented JDBC 4.1 support
+   detection.
+
 Changes in 2.2.4

 * Generate proxy classes into the same protection domain as the HikariCP