Author: markt Date: Wed Nov 12 10:49:15 2014 New Revision: 1638751 URL: http://svn.apache.org/r1638751 Log: Use SocketWrapper provided write method
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1638751&r1=1638750&r2=1638751&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Wed Nov 12 10:49:15 2014 @@ -85,36 +85,8 @@ public class AjpNioProcessor extends Abs @Override - protected int output(byte[] src, int offset, int length, boolean block) - throws IOException { - - NioEndpoint.NioSocketWrapper att = - (NioEndpoint.NioSocketWrapper) socketWrapper.getSocket().getAttachment(false); - if ( att == null ) throw new IOException("Key must be cancelled"); - - ByteBuffer writeBuffer = - socketWrapper.getSocket().getBufHandler().getWriteBuffer(); - - writeBuffer.put(src, offset, length); - - writeBuffer.flip(); - - long writeTimeout = att.getWriteTimeout(); - Selector selector = null; - try { - selector = pool.get(); - } catch (IOException x) { - //ignore - } - try { - return pool.write(writeBuffer, socketWrapper.getSocket(), selector, - writeTimeout, block); - } finally { - writeBuffer.clear(); - if (selector != null) { - pool.put(selector); - } - } + protected int output(byte[] src, int offset, int length, boolean block) throws IOException { + return socketWrapper.write(block, src, offset, length); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org