From: fhanik Date: Wed, 5 Aug 2009 16:10:05 +0000 (+0000) Subject: patch by sebb for X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1043c1024e4b8710208530b94a477d5ef5495449;p=tomcat7.0 patch by sebb for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@801283 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java index b4332229c..85be2f675 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java @@ -143,10 +143,10 @@ public class ConnectionPool { */ public Future getConnectionAsync() throws SQLException { //we can only retrieve a future if the underlying queue supports it. - if (idle instanceof FairBlockingQueue) { + if (idle instanceof FairBlockingQueue) { Future pcf = ((FairBlockingQueue)idle).pollAsync(); return new ConnectionFuture(pcf); - } else if (idle instanceof MultiLockFairBlockingQueue) { + } else if (idle instanceof MultiLockFairBlockingQueue) { Future pcf = ((MultiLockFairBlockingQueue)idle).pollAsync(); return new ConnectionFuture(pcf); } else { @@ -1069,6 +1069,7 @@ public class ConnectionPool { } } + @Override public void run() { while (run) { try { diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java index ff291aab0..142c5b7cb 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java @@ -188,6 +188,7 @@ public class DataSourceProxy implements PoolConfiguration { else return p.getSize(); } + @Override public String toString() { return super.toString()+"{"+getPoolProperties()+"}"; } diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java index 5a0325c33..ea56e8671 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java @@ -185,11 +185,11 @@ public class FairBlockingQueue implements BlockingQueue { waiters.addLast(c); lock.unlock(); //return a future that will wait for the object - result = new ItemFuture(c); + result = new ItemFuture(c); } else { lock.unlock(); //return a future with the item - result = new ItemFuture(item); + result = new ItemFuture(item); } error = false; } finally { diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java index 1ec8064a0..7d37eaa9e 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java @@ -196,11 +196,11 @@ public class MultiLockFairBlockingQueue implements BlockingQueue { waiters[idx].addLast(c); lock.unlock(); //return a future that will wait for the object - result = new ItemFuture(c); + result = new ItemFuture(c); } else { lock.unlock(); //return a future with the item - result = new ItemFuture(item); + result = new ItemFuture(item); } error = false; } finally { @@ -323,9 +323,9 @@ public class MultiLockFairBlockingQueue implements BlockingQueue { * {@inheritDoc} */ public boolean addAll(Collection c) { - Iterator i = c.iterator(); + Iterator i = c.iterator(); while (i.hasNext()) { - E e = (E)i.next(); + E e = i.next(); offer(e); } return true; diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java index d55e766d4..63e6a3a0e 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java @@ -651,6 +651,7 @@ public class PoolProperties implements PoolConfiguration { this.interceptors = null; } + @Override public String toString() { StringBuffer buf = new StringBuffer("ConnectionPool["); try { @@ -786,9 +787,11 @@ public class PoolProperties implements PoolConfiguration { public String getValue() { return value; } + @Override public int hashCode() { return name.hashCode(); } + @Override public boolean equals(Object o) { if (o==this) return true; if (o instanceof InterceptorProperty) { diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java index 8991a605b..167f1ae2c 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java @@ -291,7 +291,8 @@ public class PooledConnection { * * @return true if the connection was validated successfully. It returns true even if validation was not performed, such as when * {@link PoolConfiguration#setValidationInterval(long)} has been called with a positive value. - * @return false if the validation failed. The caller should close the connection if false is returned since a session could have been left in + *

+ * false if the validation failed. The caller should close the connection if false is returned since a session could have been left in * an unknown state during initialization. */ public boolean validate(int validateAction,String sql) { @@ -322,7 +323,7 @@ public class PooledConnection { Statement stmt = null; try { stmt = connection.createStatement(); - boolean exec = stmt.execute(query); + stmt.execute(query); stmt.close(); this.lastValidated = now; return true; @@ -516,6 +517,7 @@ public class PooledConnection { this.handler = handler; } + @Override public String toString() { return "PooledConnection["+(connection!=null?connection.toString():"null")+"]"; } diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java index f3cab3a07..8357846ba 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java @@ -59,6 +59,7 @@ public class ProxyConnection extends JdbcInterceptor { setUseEquals(useEquals); } + @Override public void reset(ConnectionPool parent, PooledConnection con) { this.pool = parent; this.connection = con; @@ -77,6 +78,7 @@ public class ProxyConnection extends JdbcInterceptor { } } + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (compare(ISCLOSED_VAL,method)) { return Boolean.valueOf(isClosed()); @@ -117,6 +119,7 @@ public class ProxyConnection extends JdbcInterceptor { return pool; } + @Override public String toString() { return "ProxyConnection["+(connection!=null?connection.toString():"null")+"]"; } diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java index 300b815a5..50567784f 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java @@ -52,6 +52,7 @@ public class ConnectionState extends JdbcInterceptor { protected String catalog = null; + @Override public void reset(ConnectionPool parent, PooledConnection con) { if (parent==null || con==null) return; PoolConfiguration poolProperties = parent.getPoolProperties(); diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java index 28a71a411..82035d6f9 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java @@ -287,6 +287,7 @@ public class SlowQueryReport extends AbstractQueryReport { return FIELD_TYPES; } + @Override public String toString() { StringBuffer buf = new StringBuffer("QueryStats[query:"); buf.append(query); @@ -390,10 +391,12 @@ public class SlowQueryReport extends AbstractQueryReport { return totalInvocationTime; } + @Override public int hashCode() { return query.hashCode(); } + @Override public boolean equals(Object other) { if (other instanceof QueryStats) { QueryStats qs = (QueryStats)other;