Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #2592 - changes to fix ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP] on windows 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2018-05-31 19:41:34 +10:00
parent 6cec65b21b
commit 1bf5128e6d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -1044,7 +1044,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
if (LOG.isDebugEnabled())
LOG.debug("onError", th);
_writeListener.onError(th);
close();
abort(th);
return;
}
}

15
tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
View File

@ -143,6 +143,7 @@ public class ServerTimeoutsTest extends AbstractTest
{
if (t instanceof TimeoutException)
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR_500);
asyncContext.complete();
}
});
@ -494,9 +495,10 @@ public class ServerTimeoutsTest extends AbstractTest
if (failure instanceof TimeoutException)
{
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR_500);
asyncContext.complete();
handlerLatch.countDown();
}
asyncContext.complete();
}
});
}
@ -542,17 +544,17 @@ public class ServerTimeoutsTest extends AbstractTest
@Override
public void onWritePossible() throws IOException
{
output.write(new byte[64 * 1024 * 1024]);
if (output.isReady())
output.write(new byte[64 * 1024 * 1024]);
}
@Override
public void onError(Throwable failure)
{
if (failure instanceof TimeoutException)
{
asyncContext.complete();
handlerLatch.countDown();
}
asyncContext.complete();
}
});
}
@ -749,9 +751,10 @@ public class ServerTimeoutsTest extends AbstractTest
if (failure instanceof TimeoutException)
{
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR_500);
asyncContext.complete();
handlerLatch.countDown();
}
asyncContext.complete();
}
});
}