Author: markt
Date: Tue Jun 19 11:31:14 2018
New Revision: 1833823
URL: http://svn.apache.org/viewvc?rev=1833823&view=rev
Log:
Minor updates after comparing 8.0.x with 9.0.x
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
Tue Jun 19 11:31:14 2018
@@ -412,7 +412,6 @@ public class BasicDataSource implements
*
* @param lifo
* the new value for the LIFO property
- *
*/
public synchronized void setLifo(final boolean lifo) {
this.lifo = lifo;
@@ -2027,13 +2026,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 (final Exception e) {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
Tue Jun 19 11:31:14 2018
@@ -183,7 +183,7 @@ public class DelegatingCallableStatement
}
}
- /** @deprecated */
+ /** @deprecated Use {@link #getBigDecimal(int)} or {@link
#getBigDecimal(String)} */
@Override
@Deprecated
public BigDecimal getBigDecimal(final int parameterIndex, final int scale)
throws SQLException {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
Tue Jun 19 11:31:14 2018
@@ -245,7 +245,7 @@ public class DelegatingPreparedStatement
}
}
- /** @deprecated */
+ /** @deprecated Use setAsciiStream(), setCharacterStream() or
setNCharacterStream() */
@Deprecated
@Override
public void setUnicodeStream(final int parameterIndex, final InputStream
x, final int length) throws SQLException {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
Tue Jun 19 11:31:14 2018
@@ -301,7 +301,7 @@ public final class DelegatingResultSet e
}
}
- /** @deprecated */
+ /** @deprecated Use {@link #getBigDecimal(int)} */
@Deprecated
@Override
public BigDecimal getBigDecimal(final int columnIndex, final int scale)
throws SQLException {
@@ -363,7 +363,7 @@ public final class DelegatingResultSet e
}
}
- /** @deprecated */
+ /** @deprecated Use {@link #getCharacterStream(int)} */
@Deprecated
@Override
public InputStream getUnicodeStream(final int columnIndex) throws
SQLException {
@@ -465,7 +465,7 @@ public final class DelegatingResultSet e
}
}
- /** @deprecated */
+ /** @deprecated Use {@link #getBigDecimal(String)} */
@Deprecated
@Override
public BigDecimal getBigDecimal(final String columnName, final int scale)
throws SQLException {
@@ -527,7 +527,7 @@ public final class DelegatingResultSet e
}
}
- /** @deprecated */
+ /** @deprecated Use {@link #getCharacterStream(String)} */
@Deprecated
@Override
public InputStream getUnicodeStream(final String columnName) throws
SQLException {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.java
Tue Jun 19 11:31:14 2018
@@ -41,5 +41,4 @@ class LifetimeExceededException extends
public LifetimeExceededException(final String message) {
super(message);
}
-
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
Tue Jun 19 11:31:14 2018
@@ -44,7 +44,7 @@ public class PoolableConnection extends
static {
try {
MBEAN_SERVER = ManagementFactory.getPlatformMBeanServer();
- } catch (Exception ex) {
+ } catch (NoClassDefFoundError | Exception ex) {
// ignore - JMX not available
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
Tue Jun 19 11:31:14 2018
@@ -340,7 +340,7 @@ public class PoolableConnectionFactory i
throw new SQLException("initializeConnection: connection closed");
}
if (null != sqls) {
- try (Statement stmt = conn.createStatement();) {
+ try (Statement stmt = conn.createStatement()) {
for (final String sql : sqls) {
Objects.requireNonNull(sql, "null connectionInitSqls
element");
stmt.execute(sql);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java Tue
Jun 19 11:31:14 2018
@@ -1599,7 +1599,7 @@ public final class PoolUtils {
* @param erodingFactor
* erosion factor - determines the frequency of erosion
* events
- * @see #factor
+ * @see #erodingFactor
*/
protected ErodingKeyedObjectPool(final KeyedObjectPool<K, V> keyedPool,
final ErodingFactor erodingFactor) {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
Tue Jun 19 11:31:14 2018
@@ -232,9 +232,10 @@ public class AbandonedConfig {
}
/**
- * If the pool implements {@link UsageTracking}, should the pool record a
- * stack trace every time a method is called on a pooled object and retain
- * the most recent stack trace to aid debugging of abandoned objects?
+ * If the pool implements
+ * {@link org.apache.tomcat.dbcp.pool2.UsageTracking}, should the pool
+ * record a stack trace every time a method is called on a pooled object
and
+ * retain the most recent stack trace to aid debugging of abandoned
objects?
*/
private boolean useUsageTracking = false;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java?rev=1833823&r1=1833822&r2=1833823&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
Tue Jun 19 11:31:14 2018
@@ -111,7 +111,7 @@ public class SoftReferenceObjectPool<T>
* if an exception occurs creating a new instance
* @return a valid, activated object instance
*/
- @SuppressWarnings("null") // ref can not be null
+ @SuppressWarnings("null") // ref cannot be null
@Override
public synchronized T borrowObject() throws Exception {
assertOpen();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
