Author: remm
Date: Mon Mar 10 17:38:27 2014
New Revision: 1576013
URL: http://svn.apache.org/r1576013
Log:
Stop using writeTimeout for now (I don't see the point at the moment).
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java?rev=1576013&r1=1576012&r2=1576013&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
Mon Mar 10 17:38:27 2014
@@ -28,7 +28,6 @@ import java.util.concurrent.TimeoutExcep
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
-import org.apache.tomcat.util.net.Nio2Endpoint.Nio2SocketWrapper;
import org.apache.tomcat.util.net.SocketWrapper;
public class Nio2ServletOutputStream extends
AbstractServletOutputStream<Nio2Channel> {
@@ -116,13 +115,12 @@ public class Nio2ServletOutputStream ext
throws IOException {
ByteBuffer buffer = channel.getBufHandler().getWriteBuffer();
int written = 0;
- long writeTimeout = ((Nio2SocketWrapper)
socketWrapper).getWriteTimeout();
if (block) {
buffer.clear();
buffer.put(b, off, len);
buffer.flip();
try {
- written = channel.write(buffer).get(writeTimeout,
TimeUnit.MILLISECONDS).intValue();
+ written =
channel.write(buffer).get(socketWrapper.getTimeout(),
TimeUnit.MILLISECONDS).intValue();
} catch (InterruptedException | ExecutionException
| TimeoutException e) {
onError(e);
@@ -136,7 +134,7 @@ public class Nio2ServletOutputStream ext
buffer.flip();
writePending = true;
Nio2Endpoint.startInline();
- channel.write(buffer, writeTimeout, TimeUnit.MILLISECONDS,
socketWrapper, completionHandler);
+ channel.write(buffer, socketWrapper.getTimeout(),
TimeUnit.MILLISECONDS, socketWrapper, completionHandler);
Nio2Endpoint.endInline();
written = len;
}
@@ -147,10 +145,9 @@ public class Nio2ServletOutputStream ext
@Override
protected void doFlush() throws IOException {
- long writeTimeout = ((Nio2SocketWrapper)
socketWrapper).getWriteTimeout();
try {
if (!writePending) {
- channel.flush().get(writeTimeout, TimeUnit.MILLISECONDS);
+ channel.flush().get(socketWrapper.getTimeout(),
TimeUnit.MILLISECONDS);
}
} catch (InterruptedException | ExecutionException | TimeoutException
e) {
onError(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
