Author: markt
Date: Mon Aug 22 13:48:09 2016
New Revision: 1757167
URL: http://svn.apache.org/viewvc?rev=1757167&view=rev
Log:
Update DBCP2 to r1757164
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
tomcat/trunk/webapps/docs/changelog.xml
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 13:48:09 2016
@@ -1,2 +1,2 @@
-/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1743696
-/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2:1593516-1743696
+/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1757164
+/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2:1593516-1757164
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java?rev=1757167&r1=1757166&r2=1757167&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
Mon Aug 22 13:48:09 2016
@@ -236,7 +236,7 @@ public class BasicDataSourceFactory impl
* @param environment The possibly null environment that is used in
* creating this object
*
- * @exception Exception if an exception occurs creating the instance
+ * @throws Exception if an exception occurs creating the instance
*/
@Override
public Object getObjectInstance(final Object obj, final Name name, final
Context nameCtx, final Hashtable<?,?> environment)
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java?rev=1757167&r1=1757166&r2=1757167&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
Mon Aug 22 13:48:09 2016
@@ -598,10 +598,9 @@ public class DelegatingConnection<C exte
}
}
-
@Override
public boolean isClosed() throws SQLException {
- return _closed || _conn.isClosed();
+ return _closed || _conn == null || _conn.isClosed();
}
protected void checkOpen() throws SQLException {
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java?rev=1757167&r1=1757166&r2=1757167&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
Mon Aug 22 13:48:09 2016
@@ -69,7 +69,7 @@ class ConnectionImpl extends DelegatingC
* be used after closed() is called. Any further usage will result in an
* SQLException.
*
- * @exception SQLException The database connection couldn't be closed.
+ * @throws SQLException The database connection couldn't be closed.
*/
@Override
public void close() throws SQLException {
@@ -90,7 +90,7 @@ class ConnectionImpl extends DelegatingC
*
* @param sql SQL statement to be prepared
* @return the prepared statement
- * @exception SQLException if this connection is closed or an error occurs
+ * @throws SQLException if this connection is closed or an error occurs
* in the wrapped connection.
*/
@Override
@@ -111,7 +111,7 @@ class ConnectionImpl extends DelegatingC
* {@link DriverAdapterCPDS}, a pooled object may be returned, otherwise
* delegate to the wrapped JDBC 1.x {@link java.sql.Connection}.
*
- * @exception SQLException if this connection is closed or an error occurs
+ * @throws SQLException if this connection is closed or an error occurs
* in the wrapped connection.
*/
@Override
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1757167&r1=1757166&r2=1757167&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
Mon Aug 22 13:48:09 2016
@@ -130,7 +130,7 @@ class PooledConnectionImpl
* <code>PooledConnection</code> so that it may not be used
* to generate any more logical <code>Connection</code>s.
*
- * @exception SQLException if an error occurs or the connection is already
closed
+ * @throws SQLException if an error occurs or the connection is already
closed
*/
@Override
public void close() throws SQLException {
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java?rev=1757167&r1=1757166&r2=1757167&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
Mon Aug 22 13:48:09 2016
@@ -1129,8 +1129,8 @@ public class PerUserPoolDataSource exten
* Supports Serialization interface.
*
* @param in a <code>java.io.ObjectInputStream</code> value
- * @exception IOException if an error occurs
- * @exception ClassNotFoundException if an error occurs
+ * @throws IOException if an error occurs
+ * @throws ClassNotFoundException if an error occurs
*/
private void readObject(final ObjectInputStream in)
throws IOException, ClassNotFoundException {
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java?rev=1757167&r1=1757166&r2=1757167&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
Mon Aug 22 13:48:09 2016
@@ -225,8 +225,8 @@ public class SharedPoolDataSource extend
* Supports Serialization interface.
*
* @param in a <code>java.io.ObjectInputStream</code> value
- * @exception IOException if an error occurs
- * @exception ClassNotFoundException if an error occurs
+ * @throws IOException if an error occurs
+ * @throws ClassNotFoundException if an error occurs
*/
private void readObject(final ObjectInputStream in)
throws IOException, ClassNotFoundException {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1757167&r1=1757166&r2=1757167&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 22 13:48:09 2016
@@ -278,6 +278,10 @@
Update the internal fork of Commons BCEL to r1757132 to align with the
BCEL 6 release. (markt)
</update>
+ <update>
+ Update the internal fork of Commons DBCP2 to r1757164 to pick up a
+ couple of bug fixes. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
