Author: markt
Date: Wed Jul 9 22:11:43 2014
New Revision: 1609331
URL: http://svn.apache.org/r1609331
Log:
Merge changes from DBCP 2 up to r1609329.
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
tomcat/trunk/webapps/docs/changelog.xml
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
Merged
/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:r1596859-1609329
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java?rev=1609331&r1=1609330&r2=1609331&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
Wed Jul 9 22:11:43 2014
@@ -933,7 +933,7 @@ public abstract class InstanceKeyDataSou
// Password has not changed, so refuse client, but return
connection to the pool
closeDueToException(info);
throw new SQLException("Given password did not match password
used"
- + " to create the PooledConnection.");
+ + " to create the PooledConnection.",
ex);
} catch (javax.naming.NamingException ne) {
throw new SQLException(
"NamingException encountered connecting to database",
ne);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1609331&r1=1609330&r2=1609331&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 9 22:11:43 2014
@@ -221,6 +221,10 @@
Update package renamed Apache Commons Pool2 to r1609323 to pick various
bug fixes. (markt)
</update>
+ <update>
+ Update package renamed Apache Commons DBCP2 to r1609329 to pick up a
+ minor bug fix. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
