Author: markt
Date: Wed Jan 20 14:47:31 2016
New Revision: 1725731
URL: http://svn.apache.org/viewvc?rev=1725731&view=rev
Log:
Update Tomcat's fork of DBCP2 to dbcp2/trunk
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 20 14:47:31 2016
@@ -1 +1 @@
-/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1694605
+/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1725730
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Wed Jan
20 14:47:31 2016
@@ -1998,13 +1998,6 @@ public class BasicDataSource implements
throw new IllegalStateException("Cannot invalidate connection:
Unwrapping poolable connection failed.", e);
}
- // attempt to close the connection for good measure
- try {
- connection.close();
- } catch (Exception e) {
- // ignore any exceptions here
- }
-
try {
connectionPool.invalidateObject(poolableConnection);
} catch (Exception e) {
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=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
Wed Jan 20 14:47:31 2016
@@ -177,7 +177,8 @@ public class BasicDataSourceFactory impl
PROP_ENABLE_AUTOCOMMIT_ON_RETURN,
PROP_DEFAULT_QUERYTIMEOUT,
PROP_FASTFAIL_VALIDATION,
- PROP_DISCONNECTION_SQL_CODES
+ PROP_DISCONNECTION_SQL_CODES,
+ PROP_JMX_NAME
};
/**
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
Wed Jan 20 14:47:31 2016
@@ -113,7 +113,7 @@ public class DelegatingCallableStatement
public double getDouble(int parameterIndex) throws SQLException
{ checkOpen(); try { return ((CallableStatement)getDelegate()).getDouble(
parameterIndex); } catch (SQLException e) { handleException(e); return 0; } }
- /** @deprecated */
+ /** @deprecated Use {@link #getBigDecimal(int)} or {@link
#getBigDecimal(String)} */
@Override
@Deprecated
public BigDecimal getBigDecimal(int parameterIndex, int scale) throws
SQLException
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
Wed Jan 20 14:47:31 2016
@@ -161,7 +161,7 @@ public class DelegatingPreparedStatement
public void setAsciiStream(int parameterIndex, InputStream x, int length)
throws SQLException
{ checkOpen(); try {
((PreparedStatement)getDelegate()).setAsciiStream(parameterIndex,x,length); }
catch (SQLException e) { handleException(e); } }
- /** @deprecated */
+ /** @deprecated Use setAsciiStream(), setCharacterStream() or
setNCharacterStream() */
@Deprecated
@Override
public void setUnicodeStream(int parameterIndex, InputStream x, int
length) throws SQLException
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java Wed
Jan 20 14:47:31 2016
@@ -226,7 +226,7 @@ public final class DelegatingResultSet e
public double getDouble(int columnIndex) throws SQLException
{ try { return _res.getDouble(columnIndex); } catch (SQLException e) {
handleException(e); return 0; } }
- /** @deprecated */
+ /** @deprecated Use {@link #getBigDecimal(int)} */
@Deprecated
@Override
public BigDecimal getBigDecimal(int columnIndex, int scale) throws
SQLException
@@ -252,7 +252,7 @@ public final class DelegatingResultSet e
public InputStream getAsciiStream(int columnIndex) throws SQLException
{ try { return _res.getAsciiStream(columnIndex); } catch (SQLException e)
{ handleException(e); return null; } }
- /** @deprecated */
+ /** @deprecated Use {@link #getCharacterStream(int)} */
@Deprecated
@Override
public InputStream getUnicodeStream(int columnIndex) throws SQLException
@@ -294,7 +294,7 @@ public final class DelegatingResultSet e
public double getDouble(String columnName) throws SQLException
{ try { return _res.getDouble(columnName); } catch (SQLException e) {
handleException(e); return 0; } }
- /** @deprecated */
+ /** @deprecated Use {@link #getBigDecimal(String)} */
@Deprecated
@Override
public BigDecimal getBigDecimal(String columnName, int scale) throws
SQLException
@@ -320,7 +320,7 @@ public final class DelegatingResultSet e
public InputStream getAsciiStream(String columnName) throws SQLException
{ try { return _res.getAsciiStream(columnName); } catch (SQLException e) {
handleException(e); return null; } }
- /** @deprecated */
+ /** @deprecated Use {@link #getCharacterStream(String)} */
@Deprecated
@Override
public InputStream getUnicodeStream(String columnName) throws SQLException
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
Wed Jan 20 14:47:31 2016
@@ -45,6 +45,17 @@ public class DriverManagerConnectionFact
* Constructor for DriverManagerConnectionFactory.
* @param connectUri a database url of the form
* <code> jdbc:<em>subprotocol</em>:<em>subname</em></code>
+ * @since 2.2
+ */
+ public DriverManagerConnectionFactory(String connectUri) {
+ _connectUri = connectUri;
+ _props = new Properties();
+ }
+
+ /**
+ * Constructor for DriverManagerConnectionFactory.
+ * @param connectUri a database url of the form
+ * <code> jdbc:<em>subprotocol</em>:<em>subname</em></code>
* @param props a list of arbitrary string tag/value pairs as
* connection arguments; normally at least a "user" and "password"
* property should be included.
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
Wed Jan 20 14:47:31 2016
@@ -34,9 +34,10 @@ package org.apache.tomcat.dbcp.dbcp2;
/**
* Create a LifetimeExceededException with the given message.
+ *
+ * @param message The message with which to create the exception
*/
public LifetimeExceededException(String message) {
super(message);
}
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java Wed
Jan 20 14:47:31 2016
@@ -50,7 +50,7 @@ public class PoolableConnection extends
static {
try {
MBEAN_SERVER = ManagementFactory.getPlatformMBeanServer();
- } catch (Exception ex) {
+ } catch (NoClassDefFoundError | Exception ex) {
// ignore - JMX not available
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
Wed Jan 20 14:47:31 2016
@@ -86,8 +86,8 @@ class CPDSConnectionFactory
* @param validationQueryTimeout Timeout in seconds before validation fails
* @param rollbackAfterValidation whether a rollback should be issued
* after {@link #validateObject validating} {@link Connection}s.
- * @param username
- * @param password
+ * @param username The user name to use to create connections
+ * @param password The password to use to create connections
*/
public CPDSConnectionFactory(ConnectionPoolDataSource cpds,
String validationQuery,
@@ -331,9 +331,10 @@ class CPDSConnectionFactory
/**
* Sets the maximum lifetime in milliseconds of a connection after which
the
- * connection will always fail activation, passivation and validation. A
- * value of zero or less indicates an infinite lifetime. The default value
- * is -1.
+ * connection will always fail activation, passivation and validation.
+ *
+ * @param maxConnLifetimeMillis A value of zero or less indicates an
+ * infinite lifetime. The default value is -1.
*/
public void setMaxConnLifetimeMillis(long maxConnLifetimeMillis) {
this.maxConnLifetimeMillis = maxConnLifetimeMillis;
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java?rev=1725731&r1=1725730&r2=1725731&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
Wed Jan 20 14:47:31 2016
@@ -81,6 +81,8 @@ class KeyedCPDSConnectionFactory
* {@link Connection}s. Should return at least one row. May be
* {@code null} in which case3 {@link Connection#isValid(int)} will be used
* to validate connections.
+ * @param validationQueryTimeout The time, in seconds, to allow for the
+ * validation query to complete
* @param rollbackAfterValidation whether a rollback should be issued after
* {@link #validateObject validating} {@link Connection}s.
*/
@@ -330,9 +332,10 @@ class KeyedCPDSConnectionFactory
/**
* Sets the maximum lifetime in milliseconds of a connection after which
the
- * connection will always fail activation, passivation and validation. A
- * value of zero or less indicates an infinite lifetime. The default value
- * is -1.
+ * connection will always fail activation, passivation and validation.
+ *
+ * @param maxConnLifetimeMillis A value of zero or less indicates an
+ * infinite lifetime. The default value is -1.
*/
public void setMaxConnLifetimeMillis(long maxConnLifetimeMillis) {
this.maxConnLifetimeMillis = maxConnLifetimeMillis;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
