Merge branch '2.3.x' into dev

Conflicts: CHANGES hikaricp-java6/pom.xml hikaricp/pom.xml pom.xml
10 years ago · eb97e3c985
parent 03ad7653ad 16e5b0710d
commit eb97e3c985
1 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@ -15,9 +15,9 @@ Changes in 2.3.6
 * Allow explicit definition of driverClassName to override DriverManager.getDriver(url)
   located driver.

- * Fixed a rare issue where a Connection held out of the pool, and never used by the
-   holding thread, when returned to the pool may be mistakenly given to another thread
-   without testing.
+ * Fixed a rare issue where a Connection that is held out of the pool, and never used by
+   the holding thread, upon returning to the pool might be given to another thread without
+   an aliveness test.

 Changes in 2.3.5