From b073db50311c0239de65b5018f808094f48945e8 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 12 Sep 2009 16:10:43 +0000 Subject: [PATCH] Clean up unused imports and variables git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@814179 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/AprEndpoint.java | 8 -------- java/org/apache/tomcat/util/net/JIoEndpoint.java | 8 -------- java/org/apache/tomcat/util/net/NioEndpoint.java | 8 -------- 3 files changed, 24 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index abe383222..8a4ef2a62 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -17,12 +17,9 @@ package org.apache.tomcat.util.net; -import java.net.InetAddress; import java.util.ArrayList; import java.util.HashMap; -import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -38,11 +35,6 @@ import org.apache.tomcat.jni.SSLContext; import org.apache.tomcat.jni.SSLSocket; import org.apache.tomcat.jni.Socket; import org.apache.tomcat.jni.Status; -import org.apache.tomcat.util.res.StringManager; -import org.apache.tomcat.util.threads.ResizableExecutor; -import org.apache.tomcat.util.threads.TaskQueue; -import org.apache.tomcat.util.threads.TaskThreadFactory; -import org.apache.tomcat.util.threads.ThreadPoolExecutor; /** * APR tailored thread pool, providing the following services: diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java index aa5fd2cca..325059611 100644 --- a/java/org/apache/tomcat/util/net/JIoEndpoint.java +++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java @@ -19,21 +19,13 @@ package org.apache.tomcat.util.net; import java.io.IOException; import java.net.BindException; -import java.net.InetAddress; import java.net.ServerSocket; import java.net.Socket; -import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; -import org.apache.tomcat.util.res.StringManager; -import org.apache.tomcat.util.threads.ResizableExecutor; -import org.apache.tomcat.util.threads.TaskQueue; -import org.apache.tomcat.util.threads.TaskThreadFactory; -import org.apache.tomcat.util.threads.ThreadPoolExecutor; /** * Handle incoming TCP connections. diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index dfe7bd8c2..145a824a7 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -20,7 +20,6 @@ package org.apache.tomcat.util.net; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketTimeoutException; @@ -38,7 +37,6 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -57,11 +55,6 @@ import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler; import org.apache.tomcat.util.net.jsse.NioX509KeyManager; -import org.apache.tomcat.util.res.StringManager; -import org.apache.tomcat.util.threads.ResizableExecutor; -import org.apache.tomcat.util.threads.TaskQueue; -import org.apache.tomcat.util.threads.TaskThreadFactory; -import org.apache.tomcat.util.threads.ThreadPoolExecutor; /** * NIO tailored thread pool, providing the following services: @@ -286,7 +279,6 @@ public class NioEndpoint extends AbstractEndpoint { @Override public boolean setProperty(String name, String value) { final String selectorPoolName = "selectorPool."; - final String socketName = "socket."; try { if (name.startsWith(selectorPoolName)) { return IntrospectionUtils.setProperty(selectorPool, name.substring(selectorPoolName.length()), value); -- 2.11.0