Author: markt
Date: Tue Jun 19 09:04:08 2018
New Revision: 1833794
URL: http://svn.apache.org/viewvc?rev=1833794&view=rev
Log:
Update the internal fork of Commons DBCP 2 to 2.4.0.
Added:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ListException.java (with
props)
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java
(with props)
Modified:
tomcat/trunk/MERGE.txt
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
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/BasicDataSourceMXBean.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/ConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Constants.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.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/DelegatingStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.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/PStmtKey.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDriver.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PoolKey.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/UserPassKey.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/DataSourceXAConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/XAConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1833794&r1=1833793&r2=1833794&view=diff
==============================================================================
--- tomcat/trunk/MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Tue Jun 19 09:04:08 2018
@@ -66,10 +66,10 @@ DBCP
----
DBCP2
Sub-tree
-/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2
-/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2
+src/main/java/org/apache/commons/dbcp2
+src/main/resources/org/apache/commons/dbcp2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-8a71764a895b234bd1fc76553835ef4c974f22e1
+d7aa662fbbb99e536ae28c47d0c4e1d51e39d5b9
Pool2
Sub-tree
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java?rev=1833794&r1=1833793&r2=1833794&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java Tue Jun
19 09:04:08 2018
@@ -25,43 +25,43 @@ import java.util.List;
import org.apache.tomcat.dbcp.pool2.TrackedUse;
/**
- * Tracks db connection usage for recovering and reporting
- * abandoned db connections.
+ * Tracks db connection usage for recovering and reporting abandoned db
connections.
+ * <p>
+ * The JDBC Connection, Statement, and ResultSet classes extend this class.
+ * </p>
*
- * The JDBC Connection, Statement, and ResultSet classes
- * extend this class.
- *
- * @author Glenn L. Nielsen
* @since 2.0
*/
public class AbandonedTrace implements TrackedUse {
- /** A list of objects created by children of this object */
+ /** A list of objects created by children of this object. */
private final List<WeakReference<AbandonedTrace>> traceList = new
ArrayList<>();
- /** Last time this connection was used */
- private volatile long lastUsed = 0;
+
+ /** Last time this connection was used. */
+ private volatile long lastUsedMillis = 0;
/**
- * Create a new AbandonedTrace without config and
- * without doing abandoned tracing.
+ * Creates a new AbandonedTrace without config and without doing abandoned
tracing.
*/
public AbandonedTrace() {
init(null);
}
/**
- * Construct a new AbandonedTrace with a parent object.
+ * Constructs a new AbandonedTrace with a parent object.
*
- * @param parent AbandonedTrace parent object
+ * @param parent
+ * AbandonedTrace parent object.
*/
public AbandonedTrace(final AbandonedTrace parent) {
init(parent);
}
/**
- * Initialize abandoned tracing for this object.
+ * Initializes abandoned tracing for this object.
*
- * @param parent AbandonedTrace parent object
+ * @param parent
+ * AbandonedTrace parent object.
*/
private void init(final AbandonedTrace parent) {
if (parent != null) {
@@ -70,37 +70,37 @@ public class AbandonedTrace implements T
}
/**
- * Get the last time this object was used in ms.
+ * Gets the last time this object was used in milliseconds.
*
- * @return long time in ms
+ * @return long time in milliseconds.
*/
@Override
public long getLastUsed() {
- return lastUsed;
+ return lastUsedMillis;
}
/**
- * Set the time this object was last used to the
- * current time in ms.
+ * Sets the time this object was last used to the current time in
milliseconds.
*/
protected void setLastUsed() {
- lastUsed = System.currentTimeMillis();
+ lastUsedMillis = System.currentTimeMillis();
}
/**
- * Set the time in ms this object was last used.
+ * Sets the time in milliseconds this object was last used.
*
- * @param time time in ms
+ * @param lastUsedMillis
+ * time in milliseconds.
*/
- protected void setLastUsed(final long time) {
- lastUsed = time;
+ protected void setLastUsed(final long lastUsedMillis) {
+ this.lastUsedMillis = lastUsedMillis;
}
/**
- * Add an object to the list of objects being
- * traced.
+ * Adds an object to the list of objects being traced.
*
- * @param trace AbandonedTrace object to add
+ * @param trace
+ * AbandonedTrace object to add.
*/
protected void addTrace(final AbandonedTrace trace) {
synchronized (this.traceList) {
@@ -110,19 +110,18 @@ public class AbandonedTrace implements T
}
/**
- * Clear the list of objects being traced by this
- * object.
+ * Clears the list of objects being traced by this object.
*/
protected void clearTrace() {
- synchronized(this.traceList) {
+ synchronized (this.traceList) {
this.traceList.clear();
}
}
/**
- * Get a list of objects being traced by this object.
+ * Gets a list of objects being traced by this object.
*
- * @return List of objects
+ * @return List of objects.
*/
protected List<AbandonedTrace> getTrace() {
final int size = traceList.size();
@@ -133,12 +132,12 @@ public class AbandonedTrace implements T
synchronized (this.traceList) {
final Iterator<WeakReference<AbandonedTrace>> iter =
traceList.iterator();
while (iter.hasNext()) {
- final WeakReference<AbandonedTrace> ref = iter.next();
- if (ref.get() == null) {
+ final AbandonedTrace trace = iter.next().get();
+ if (trace == null) {
// Clean-up since we are here anyway
iter.remove();
} else {
- result.add(ref.get());
+ result.add(trace);
}
}
}
@@ -146,19 +145,20 @@ public class AbandonedTrace implements T
}
/**
- * Remove a child object this object is tracing.
+ * Removes a child object this object is tracing.
*
- * @param trace AbandonedTrace object to remove
+ * @param trace
+ * AbandonedTrace object to remove.
*/
protected void removeTrace(final AbandonedTrace trace) {
- synchronized(this.traceList) {
+ synchronized (this.traceList) {
final Iterator<WeakReference<AbandonedTrace>> iter =
traceList.iterator();
while (iter.hasNext()) {
- final WeakReference<AbandonedTrace> ref = iter.next();
- if (trace.equals(ref.get())) {
+ final AbandonedTrace traceInList = iter.next().get();
+ if (trace.equals(traceInList)) {
iter.remove();
break;
- } else if (ref.get() == null) {
+ } else if (traceInList == null) {
// Clean-up since we are here anyway
iter.remove();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
