Author: markt
Date: Thu Mar 26 17:02:20 2009
New Revision: 758745
URL: http://svn.apache.org/viewvc?rev=758745&view=rev
Log:
Remove deprecation from code associated with handling abandoned connections.
The issue that cause this code to be deprecated (returning connections to the
pool) has been fixed by closing the abandoned connection and not returning it
to the pool.
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedConfig.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnection.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedConfig.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedConfig.java?rev=758745&r1=758744&r2=758745&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedConfig.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedConfig.java
Thu Mar 26 17:02:20 2009
@@ -24,7 +24,6 @@
*
* @author Glenn L. Nielsen
* @version $Revision$ $Date$
- * @deprecated This will be removed in a future version of DBCP.
*/
public class AbandonedConfig {
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java?rev=758745&r1=758744&r2=758745&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedObjectPool.java
Thu Mar 26 17:02:20 2009
@@ -32,7 +32,6 @@
*
* @author Glenn L. Nielsen
* @version $Revision$ $Date$
- * @deprecated This will be removed in a future version of DBCP.
*/
public class AbandonedObjectPool extends GenericObjectPool {
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java?rev=758745&r1=758744&r2=758745&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java
Thu Mar 26 17:02:20 2009
@@ -32,7 +32,6 @@
*
* @author Glenn L. Nielsen
* @version $Revision$ $Date$
- * @deprecated This will be removed in a future version of DBCP.
*/
public class AbandonedTrace {
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java?rev=758745&r1=758744&r2=758745&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
Thu Mar 26 17:02:20 2009
@@ -1107,7 +1107,6 @@
* <ul><li>{...@link #getRemoveAbandoned()} = true </li>
* <li>{...@link #getNumActive()} > {...@link #getMaxActive()} - 3
</li>
* <li>{...@link #getNumIdle()} < 2 </li></ul></p>
- * @deprecated
*/
public boolean getRemoveAbandoned() {
if (abandonedConfig != null) {
@@ -1117,7 +1116,6 @@
}
/**
- * @deprecated
* @param removeAbandoned new removeAbandoned property value
* @see #getRemoveAbandoned()
*/
@@ -1134,7 +1132,6 @@
*
* Defaults to 300 seconds.
* @return abandoned connection timeout
- * @deprecated
*/
public int getRemoveAbandonedTimeout() {
if (abandonedConfig != null) {
@@ -1144,7 +1141,6 @@
}
/**
- * @deprecated
* @param removeAbandonedTimeout new removeAbandonedTimeout value
*/
public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
@@ -1164,8 +1160,6 @@
* <p>Logging of abandoned Statements and Connections adds overhead
* for every Connection open or new Statement because a stack
* trace has to be generated. </p>
- *
- * @deprecated
*/
public boolean getLogAbandoned() {
if (abandonedConfig != null) {
@@ -1175,7 +1169,6 @@
}
/**
- * @deprecated
* @param logAbandoned new logAbandoned property value
*/
public void setLogAbandoned(boolean logAbandoned) {
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java?rev=758745&r1=758744&r2=758745&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
Thu Mar 26 17:02:20 2009
@@ -91,7 +91,6 @@
*
* @param c the {...@link Connection} to delegate all calls to.
* @param config the configuration for tracing abandoned objects
- * @deprecated AbandonedConfig is now deprecated.
*/
public DelegatingConnection(Connection c, AbandonedConfig config) {
super(config);
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnection.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnection.java?rev=758745&r1=758744&r2=758745&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnection.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnection.java
Thu Mar 26 17:02:20 2009
@@ -51,7 +51,6 @@
* @param conn my underlying connection
* @param pool the pool to which I should return when closed
* @param config the abandoned configuration settings
- * @deprecated AbandonedConfig is now deprecated.
*/
public PoolableConnection(Connection conn, ObjectPool pool,
AbandonedConfig config) {
super(conn, config);
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java?rev=758745&r1=758744&r2=758745&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
Thu Mar 26 17:02:20 2009
@@ -230,7 +230,6 @@
* @param defaultReadOnly the default "read only" setting for borrowed
{...@link Connection}s
* @param defaultAutoCommit the default "auto commit" setting for returned
{...@link Connection}s
* @param config the AbandonedConfig if tracing SQL objects
- * @deprecated AbandonedConfig is now deprecated.
*/
public PoolableConnectionFactory(
ConnectionFactory connFactory,
@@ -261,7 +260,6 @@
* @param defaultAutoCommit the default "auto commit" setting for returned
{...@link Connection}s
* @param defaultTransactionIsolation the default "Transaction Isolation"
setting for returned {...@link Connection}s
* @param config the AbandonedConfig if tracing SQL objects
- * @deprecated AbandonedConfig is now deprecated.
*/
public PoolableConnectionFactory(
ConnectionFactory connFactory,
@@ -295,7 +293,6 @@
* @param defaultTransactionIsolation the default "Transaction Isolation"
setting for returned {...@link Connection}s
* @param defaultCatalog the default "catalog" setting for returned
{...@link Connection}s
* @param config the AbandonedConfig if tracing SQL objects
- * @deprecated AbandonedConfig is now deprecated.
*/
public PoolableConnectionFactory(
ConnectionFactory connFactory,
@@ -734,7 +731,7 @@
protected String _defaultCatalog;
/**
- * @deprecated AbandonedConfig is now deprecated.
+ * Configuration for removing abandoned connections.
*/
protected AbandonedConfig _config = null;
