Author: markt Date: Fri Aug 7 12:30:49 2009 New Revision: 801969 URL: http://svn.apache.org/viewvc?rev=801969&view=rev Log: Removed unused imports and an unused local variable reported by Eclipse
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java tomcat/trunk/java/org/apache/catalina/session/FileStore.java tomcat/trunk/java/org/apache/catalina/session/StandardManager.java tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java?rev=801969&r1=801968&r2=801969&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Fri Aug 7 12:30:49 2009 @@ -23,13 +23,10 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import javax.management.ObjectInstance; -import java.util.Enumeration; import java.util.Iterator; import java.util.Set; import org.apache.tomcat.util.modeler.Registry; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; /* * Listener to provider informations to mod_heartbeat.c Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?rev=801969&r1=801968&r2=801969&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Fri Aug 7 12:30:49 2009 @@ -20,17 +20,12 @@ import org.apache.catalina.ContainerEvent; import org.apache.catalina.ContainerListener; -import org.apache.catalina.Engine; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import org.apache.catalina.connector.Connector; - -import org.apache.tomcat.util.modeler.Registry; - /* * Listener to provider informations to mod_heartbeat.c * *msg_format = "v=%u&ready=%u&busy=%u"; (message to send). @@ -83,7 +78,7 @@ } public void lifecycleEvent(LifecycleEvent event) { - Object source = event.getLifecycle(); + if (Lifecycle.PERIODIC_EVENT.equals(event.getType())) { if (sender == null) { if (proxyList == null) Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java?rev=801969&r1=801968&r2=801969&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java Fri Aug 7 12:30:49 2009 @@ -28,8 +28,6 @@ import java.io.OutputStreamWriter; import java.net.InetAddress; import java.net.Socket; -import java.net.InetAddress; -import java.io.UnsupportedEncodingException; import java.util.StringTokenizer; /* Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=801969&r1=801968&r2=801969&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Fri Aug 7 12:30:49 2009 @@ -34,7 +34,6 @@ import org.apache.catalina.Container; import org.apache.catalina.Context; -import org.apache.catalina.Globals; import org.apache.catalina.Loader; import org.apache.catalina.Session; import org.apache.catalina.util.CustomObjectInputStream; Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=801969&r1=801968&r2=801969&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Fri Aug 7 12:30:49 2009 @@ -37,7 +37,6 @@ import javax.servlet.ServletContext; import org.apache.catalina.Container; import org.apache.catalina.Context; -import org.apache.catalina.Globals; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=801969&r1=801968&r2=801969&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Aug 7 12:30:49 2009 @@ -23,7 +23,6 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; -import java.net.SocketAddress; import java.net.SocketTimeoutException; import java.nio.ByteBuffer; import java.nio.channels.CancelledKeyException; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org