Author: markt Date: Sat Jan 12 21:19:40 2013 New Revision: 1432516 URL: http://svn.apache.org/viewvc?rev=1432516&view=rev Log: Remove unused code reported by FindBugs
Modified: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java Modified: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java?rev=1432516&r1=1432515&r2=1432516&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java Sat Jan 12 21:19:40 2013 @@ -17,8 +17,6 @@ package org.apache.tomcat.jdbc.test; import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; import java.util.concurrent.CountDownLatch; import javax.sql.DataSource; @@ -373,7 +371,6 @@ public class CheckOutThreadTest extends public class TestThread extends Thread { protected DataSource d; - protected String query = null; @Override public void run() { long max = -1, totalmax=0, totalcmax=0, cmax = -1, nroffetch = 0, totalruntime = 0; @@ -387,14 +384,6 @@ public class CheckOutThreadTest extends totalmax += delta; max = Math.max(delta, max); nroffetch++; - if (query!=null) { - Statement st = con.createStatement(); - ResultSet rs = st.executeQuery(query); - while (rs.next()) { - } - rs.close(); - st.close(); - } } finally { long cstart = System.nanoTime(); if (con!=null) try {con.close();}catch(Exception x) {x.printStackTrace();} Modified: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java?rev=1432516&r1=1432515&r2=1432516&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java Sat Jan 12 21:19:40 2013 @@ -17,8 +17,6 @@ package org.apache.tomcat.jdbc.test; import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -235,7 +233,6 @@ public class ConnectCountTest extends De public class TestThread extends Thread { protected DataSource d; - protected String query = null; protected long sleep = 10; protected boolean async = false; long minwait = Long.MAX_VALUE, maxwait = -1, totalwait=0, totalcmax=0, cmax = -1, nroffetch = 0, totalruntime = 0; @@ -259,14 +256,6 @@ public class ConnectCountTest extends De maxwait = Math.max(delta, maxwait); minwait = Math.min(delta, minwait); nroffetch++; - if (query!=null) { - Statement st = con.createStatement(); - ResultSet rs = st.executeQuery(query); - while (rs.next()) { - } - rs.close(); - st.close(); - } try { if (ConnectCountTest.this.sleep>0) sleep(ConnectCountTest.this.sleep); } catch (InterruptedException x) { Modified: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java?rev=1432516&r1=1432515&r2=1432516&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java Sat Jan 12 21:19:40 2013 @@ -17,8 +17,6 @@ package org.apache.tomcat.jdbc.test; import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -216,7 +214,6 @@ public class FairnessTest extends Defaul public class TestThread extends Thread { protected DataSource d; - protected String query = null; protected long sleep = 10; protected boolean async = false; long minwait = Long.MAX_VALUE, maxwait = -1, totalwait=0, totalcmax=0, cmax = -1, nroffetch = 0, totalruntime = 0; @@ -240,14 +237,6 @@ public class FairnessTest extends Defaul maxwait = Math.max(delta, maxwait); minwait = Math.min(delta, minwait); nroffetch++; - if (query!=null) { - Statement st = con.createStatement(); - ResultSet rs = st.executeQuery(query); - while (rs.next()) { - } - rs.close(); - st.close(); - } try { if (FairnessTest.this.sleep>0) sleep(FairnessTest.this.sleep); } catch (InterruptedException x) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org