svn commit: r1096260 - in /commons/proper/dbcp/trunk/src: changes/changes.xml java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java

[psteitz]

Author: psteitz
Date: Sat Apr 23 23:55:27 2011
New Revision: 1096260

URL: http://svn.apache.org/viewvc?rev=1096260&view=rev
Log:
Changed DelegatingDatabaseMetaData to no longer add itself to the 
AbandonedTrace of its parent
connection.  This was causing excessive memory consumption and was not 
necessary, as
resultsets created by DelegatingDatabaseMetaData instances are attached to the 
parent
connection's trace on creation.
JIRA: DBCP-330
JIRA: DBCP-352


Modified:
    commons/proper/dbcp/trunk/src/changes/changes.xml
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java

Modified: commons/proper/dbcp/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1096260&r1=1096259&r2=1096260&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Sat Apr 23 23:55:27 2011
@@ -41,6 +41,12 @@ The <action> type attribute can be add,u
     <release version="2.0" date="TBD" description="TBD">
     </release>
     <release version="1.4.1" date="TBD" description="TBD">
+      <action dev="psteitz" issue="DBCP-330" type="fix">
+        Changed DelegatingDatabaseMetaData to no longer add itself to the 
AbandonedTrace
+        of its parent connection.  This was causing excessive memory 
consumption and was
+        not necessary, as resultsets created by DelegatingDatabaseMetaData 
instances are
+        attached to the parent connection's trace on creation.  Also fixes 
DBCP-352.
+      </action>
       <action dev="psteitz" issue="DBCP-343" type="fix">
         Modified execute methods of Statement objects to ensure that whenever
         a statement is used, the lastUsed property of its parent connection is

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java?rev=1096260&r1=1096259&r2=1096260&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
 Sat Apr 23 23:55:27 2011
@@ -26,20 +26,14 @@ import java.sql.RowIdLifetime;
 import java.sql.SQLException;
 
 /**
- * A base delegating implementation of {@link DatabaseMetaData}.
- * <p>
- * Those methods that create {@link ResultSet} objects, are wrapped to
+ * <p>A base delegating implementation of {@link DatabaseMetaData}.</p>
+ * 
+ * <p>Methods that create {@link ResultSet} objects are wrapped to
  * create {@link DelegatingResultSet} objects and the remaining methods
  * simply call the corresponding method on the "delegate"
- * provided in my constructor.
- * <p>
- * Extends AbandonedTrace to implement DatabaseMetaData tracking and
- * logging of code which created the DatabaseMetaData. Tracking
- * the DatabaseMetaData ensures that the Connection which created it can
- * close any associated ResultSets on Connection close.
+ * provided in the constructor.</p>
  */
-public class DelegatingDatabaseMetaData extends AbandonedTrace
-        implements DatabaseMetaData {
+public class DelegatingDatabaseMetaData implements DatabaseMetaData {
 
     /** My delegate {@link DatabaseMetaData} */
     protected DatabaseMetaData _meta;
@@ -49,7 +43,7 @@ public class DelegatingDatabaseMetaData 
 
     public DelegatingDatabaseMetaData(DelegatingConnection c,
             DatabaseMetaData m) {
-        super(c);
+        super();
         _conn = c;
         _meta = m;
     }