svn commit: r725565 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java JdbcInterceptor.java ProxyConnection.java interceptor/SlowQueryReport.java

[fhanik]

Author: fhanik
Date: Wed Dec 10 19:51:10 2008
New Revision: 725565

URL: http://svn.apache.org/viewvc?rev=725565&view=rev
Log:
remove more code not needed
Modified:
    
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
    
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
    
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
    
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=725565&r1=725564&r2=725565&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Wed Dec 10 19:51:10 2008
@@ -64,6 +64,7 @@
     
//===============================================================================
     //         INSTANCE/QUICK ACCESS VARIABLE
     
//===============================================================================
+    
     /**
      * All the information about the connection pool
      */

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java?rev=725565&r1=725564&r2=725565&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
 Wed Dec 10 19:51:10 2008
@@ -74,7 +74,7 @@
      * @param con - the pooled connection
      */
     public abstract void reset(ConnectionPool parent, PooledConnection con);
-
+    
     public List<InterceptorProperty> getProperties() {
         return properties;
     }

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=725565&r1=725564&r2=725565&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
 Wed Dec 10 19:51:10 2008
@@ -84,7 +84,7 @@
         if (isClosed()) throw new SQLException("Connection has already been 
closed.");
         return method.invoke(connection.getConnection(),args);
     }
-
+    
     public boolean isClosed() {
         return connection==null || connection.isDiscarded();
     }

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=725565&r1=725564&r2=725565&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 Wed Dec 10 19:51:10 2008
@@ -53,8 +53,8 @@
     /**
      * we will be keeping track of query stats on a per pool basis, do we want 
this, or global?
      */
-    protected static 
IdentityHashMap<ConnectionPool,HashMap<String,QueryStats>> perPoolStats = 
-        new IdentityHashMap<ConnectionPool,HashMap<String,QueryStats>>();
+    protected static HashMap<String,HashMap<String,QueryStats>> perPoolStats = 
+        new HashMap<String,HashMap<String,QueryStats>>();
     /**
      * the queries that are used for this interceptor.
      */
@@ -69,11 +69,6 @@
     protected int  maxQueries= 1000; //don't store more than this amount of 
queries
     
     /**
-     * The pool that is associated with this interceptor so that we can clean 
up
-     */
-    private ConnectionPool pool = null;
-
-    /**
      * Returns the query stats for a given pool
      * @param pool - the pool we want to retrieve stats for
      * @return a hash map containing statistics for 0 to maxQueries 
@@ -115,8 +110,6 @@
     public void closeInvoked() {
         try {
             queries = null;
-            finalize();
-            pool = null;
         }catch (Exception x) {
             log.debug(x);
         }
@@ -190,14 +183,10 @@
                 }
 
             };
-            perPoolStats.put(parent, queries);
+            perPoolStats.put(parent.getName(), queries);
         }
-        this.pool = parent;
     }
     
-    public void finalize() {
-    }
-
     public CompositeData[] getSlowQueriesCD() {
         return null;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]