Author: markt
Date: Wed Feb 20 12:42:19 2013
New Revision: 1448126
URL: http://svn.apache.org/r1448126
Log:
Remove unused method. Add Javadoc to the meothd that is used.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1448126&r1=1448125&r2=1448126&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Wed Feb
20 12:42:19 2013
@@ -153,22 +153,21 @@ public class NioSelectorPool {
}
/**
- * Performs a blocking write using the bytebuffer for data to be written
and a selector to block.
- * If the <code>selector</code> parameter is null, then it will perform a
busy write that could
- * take up a lot of CPU cycles.
- * @param buf ByteBuffer - the buffer containing the data, we will write
as long as <code>(buf.hasRemaining()==true)</code>
- * @param socket SocketChannel - the socket to write data to
- * @param selector Selector - the selector to use for blocking, if null
then a busy write will be initiated
- * @param writeTimeout long - the timeout for this write operation in
milliseconds, -1 means no timeout
+ * Performs a write using the bytebuffer for data to be written and a
+ * selector to block (if blocking is requested). If the
+ * <code>selector</code> parameter is null, and blocking is requested then
+ * it will perform a busy write that could take up a lot of CPU cycles.
+ * @param buf The buffer containing the data, we will write as
long as <code>(buf.hasRemaining()==true)</code>
+ * @param socket The socket to write data to
+ * @param selector The selector to use for blocking, if null then a
busy write will be initiated
+ * @param writeTimeout The timeout for this write operation in
milliseconds, -1 means no timeout
+ * @param block <code>true</code> to perform a blocking write
+ * otherwise a non-blocking write will be performed
* @return int - returns the number of bytes written
* @throws EOFException if write returns -1
* @throws SocketTimeoutException if the write times out
* @throws IOException if an IO Exception occurs in the underlying socket
logic
*/
- public int write(ByteBuffer buf, NioChannel socket, Selector selector,
long writeTimeout) throws IOException {
- return write(buf,socket,selector,writeTimeout,true);
- }
-
public int write(ByteBuffer buf, NioChannel socket, Selector selector,
long writeTimeout, boolean block) throws IOException {
if ( SHARED && block ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
