From: markt Date: Thu, 30 Jul 2009 18:25:37 +0000 (+0000) Subject: Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4b9f915e73aed33c2edf2b17371df0c56efe1876;p=tomcat7.0 Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 Remove unused imports. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@799399 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 948034eaa..baf6a4e5f 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 @@ -16,7 +16,6 @@ */ package org.apache.tomcat.jdbc.pool; -import java.lang.management.ManagementFactory; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; @@ -36,9 +35,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.management.MBeanServer; -import javax.management.ObjectName; - import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java index c2050205e..410a06e1f 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java @@ -17,9 +17,7 @@ package org.apache.tomcat.jdbc.pool; import java.lang.management.ManagementFactory; -import java.sql.SQLException; import java.util.Hashtable; -import java.util.Properties; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistration; @@ -27,8 +25,6 @@ import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition; - /** * A DataSource that can be instantiated through IoC and implements the DataSource interface diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java index 4bb355b1a..784794e72 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java @@ -17,14 +17,8 @@ package org.apache.tomcat.jdbc.pool; -import java.io.ByteArrayInputStream; import java.io.IOException; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import java.sql.Connection; -import java.util.HashMap; import java.util.Hashtable; import java.util.Properties; 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 3c1934cb4..80bc1a379 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 @@ -22,9 +22,6 @@ import java.sql.SQLException; import java.util.Iterator; import java.util.Properties; import java.util.concurrent.Future; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; 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 345f81670..96c42d211 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 @@ -17,7 +17,6 @@ package org.apache.tomcat.jdbc.pool; -import java.lang.ref.WeakReference; import java.sql.SQLException; import java.sql.Statement; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java index f2dd78626..07af7f4d9 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java @@ -17,7 +17,6 @@ package org.apache.tomcat.jdbc.pool.jmx; /** * @author Filip Hanik */ -import java.util.Iterator; import java.util.Properties; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger;