svn commit: r1832062 - in /tomcat/trunk/modules/jdbc-pool/src: main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java test/java/org/apache/tomcat/jdbc/test/TestTimeout.java

[markt]

Author: markt
Date: Tue May 22 20:10:16 2018
New Revision: 1832062

URL: http://svn.apache.org/viewvc?rev=1832062&view=rev
Log:
Remove unused code.

Modified:
    
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
    
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
    
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1832062&r1=1832061&r2=1832062&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
 Tue May 22 20:10:16 2018
@@ -262,7 +262,6 @@ public class StatementCache extends Stat
     }
 
     protected class CachedStatement extends 
StatementDecoratorInterceptor.StatementProxy<PreparedStatement> {
-        boolean cached = false;
         CacheKey key;
         public CachedStatement(PreparedStatement parent, String sql) {
             super(parent, sql);
@@ -291,7 +290,6 @@ public class StatementCache extends Stat
                     proxy.setConnection(getConnection());
                     proxy.setConstructor(getConstructor());
                     if (cacheStatement(proxy)) {
-                        proxy.cached = true;
                         shouldClose = false;
                     }
                 } catch (RuntimeException | ReflectiveOperationException | 
SQLException x) {

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java?rev=1832062&r1=1832061&r2=1832062&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
 Tue May 22 20:10:16 2018
@@ -73,7 +73,6 @@ public class TestAsyncQueue {
     protected class OfferThread extends Thread {
         Object item = null;
         long delay = 5000;
-        volatile boolean offered = false;
         public OfferThread(Object i, long d) {
             this.item = i;
             this.delay = d;
@@ -87,7 +86,6 @@ public class TestAsyncQueue {
             } catch (Exception ignore){
                 // Ignore
             }
-            offered = true;
             TestAsyncQueue.this.queue.offer(item);
         }
     }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java?rev=1832062&r1=1832061&r2=1832062&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java
 Tue May 22 20:10:16 2018
@@ -19,15 +19,12 @@ package org.apache.tomcat.jdbc.test;
 import java.sql.Connection;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 public class TestTimeout extends DefaultTestCase {
 
-    AtomicInteger counter = new AtomicInteger(0);
-
     @Test
     public void testCheckoutTimeout() throws Exception {
         Set<Connection> cons = new HashSet<>();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org