Author: markt
Date: Mon Jan 12 07:17:00 2009
New Revision: 733779
URL: http://svn.apache.org/viewvc?rev=733779&view=rev
Log:
Misc code clean up to keepo the Eclipse error count trending downwards.
Modified:
tomcat/trunk/java/org/apache/tomcat/Apr.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/Apr.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/Apr.java?rev=733779&r1=733778&r2=733779&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/Apr.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/Apr.java Mon Jan 12 07:17:00 2009
@@ -38,7 +38,7 @@
aprInfo = props.getProperty("tcn.info");
}
catch (Throwable t) {
- ; // Nothing
+ // Do nothing
}
}
}
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=733779&r1=733778&r2=733779&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Jan 12
07:17:00 2009
@@ -32,16 +32,13 @@
import java.nio.channels.SocketChannel;
import java.nio.channels.WritableByteChannel;
import java.security.KeyStore;
-import java.util.Collection;
import java.util.Iterator;
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.LinkedBlockingQueue;
import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -1576,7 +1573,7 @@
}
sc = attachment.getChannel();
sc.setSendFile(true);
- WritableByteChannel wc =(WritableByteChannel) ((sc instanceof
SecureNioChannel)?sc:sc.getIOChannel());
+ WritableByteChannel wc = ((sc instanceof
SecureNioChannel)?sc:sc.getIOChannel());
if (sc.getOutboundRemaining()>0) {
if (sc.flushOutbound()) {
@@ -1784,7 +1781,7 @@
public void awaitReadLatch(long timeout, TimeUnit unit) throws
InterruptedException { awaitLatch(readLatch,timeout,unit);}
public void awaitWriteLatch(long timeout, TimeUnit unit) throws
InterruptedException { awaitLatch(writeLatch,timeout,unit);}
- public long getLastRegistered() { return lastRegistered; };
+ public long getLastRegistered() { return lastRegistered; }
public void setLastRegistered(long reg) { lastRegistered = reg; }
public void setSendfileData(SendfileData sf) { this.sendfileData = sf;}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
