Author: violetagg Date: Tue Aug 30 19:07:20 2016 New Revision: 1758443 URL: http://svn.apache.org/viewvc?rev=1758443&view=rev Log: Websocket write implementation now uses SocketWrapperBase.write(boolean, ByteBuffer)
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1758443&r1=1758442&r2=1758443&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Tue Aug 30 19:07:20 2016 @@ -84,9 +84,7 @@ public class WsRemoteEndpointImplServer } socketWrapper.setWriteTimeout(timeout); try { - socketWrapper.write(true, buffer.array(), buffer.arrayOffset(), - buffer.limit()); - buffer.position(buffer.limit()); + socketWrapper.write(true, buffer); timeout = blockingWriteTimeoutExpiry - System.currentTimeMillis(); if (timeout < 0) { SendResult sr = new SendResult(new SocketTimeoutException()); @@ -121,9 +119,7 @@ public class WsRemoteEndpointImplServer for (ByteBuffer buffer : buffers) { if (buffer.hasRemaining()) { complete = false; - socketWrapper.write( - false, buffer.array(), buffer.arrayOffset(), buffer.limit()); - buffer.position(buffer.limit()); + socketWrapper.write(false, buffer); break; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org