Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2c2283a

Browse files
committed
Fix PutFileTest that was closing socket while upload was still in progress
1 parent00dbf54 commit2c2283a

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

‎client/src/test/java/org/asynchttpclient/request/body/PutLargeFileTest.java‎renamed to ‎client/src/test/java/org/asynchttpclient/request/body/PutFileTest.java‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
importjava.io.File;
2020
importjava.io.IOException;
21+
importjava.io.InputStream;
2122

2223
importjavax.servlet.ServletException;
2324
importjavax.servlet.http.HttpServletRequest;
@@ -30,46 +31,44 @@
3031
importorg.eclipse.jetty.server.handler.AbstractHandler;
3132
importorg.testng.annotations.Test;
3233

33-
/**
34-
* @author Benjamin Hanzelmann
35-
*/
36-
publicclassPutLargeFileTestextendsAbstractBasicTest {
37-
38-
@Test(groups ="standalone")
39-
publicvoidtestPutLargeFile()throwsException {
40-
41-
Filefile =createTempFile(1024 *1024);
34+
publicclassPutFileTestextendsAbstractBasicTest {
4235

36+
privatevoidput(intfileSize)throwsException {
37+
Filefile =createTempFile(fileSize);
4338
inttimeout = (int)file.length() /1000;
44-
45-
try (AsyncHttpClientclient =asyncHttpClient(config().setConnectTimeout(timeout))) {
39+
try (AsyncHttpClientclient =asyncHttpClient(config().setRequestTimeout(timeout))) {
4640
Responseresponse =client.preparePut(getTargetUrl()).setBody(file).execute().get();
4741
assertEquals(response.getStatusCode(),200);
4842
}
4943
}
5044

5145
@Test(groups ="standalone")
52-
publicvoidtestPutSmallFile()throwsException {
53-
54-
Filefile =createTempFile(1024);
46+
publicvoidtestPutLargeFile()throwsException {
47+
put(1024 *1024);
48+
}
5549

56-
try (AsyncHttpClientclient =asyncHttpClient()) {
57-
Responseresponse =client.preparePut(getTargetUrl()).setBody(file).execute().get();
58-
assertEquals(response.getStatusCode(),200);
59-
}
50+
@Test(groups ="standalone")
51+
publicvoidtestPutSmallFile()throwsException {
52+
put(1024);
6053
}
6154

6255
@Override
6356
publicAbstractHandlerconfigureHandler()throwsException {
6457
returnnewAbstractHandler() {
6558

66-
publicvoidhandle(Stringarg0,Requestarg1,HttpServletRequestreq,HttpServletResponseresp)throwsIOException,ServletException {
59+
publicvoidhandle(Stringtarget,RequestbaseRequest,HttpServletRequestrequest,HttpServletResponseresponse)throwsIOException,ServletException {
6760

68-
resp.setStatus(200);
69-
resp.getOutputStream().flush();
70-
resp.getOutputStream().close();
61+
InputStreamis =baseRequest.getInputStream();
62+
intread =0;
63+
do {
64+
// drain upload
65+
read =is.read();
66+
}while (read >=0);
7167

72-
arg1.setHandled(true);
68+
response.setStatus(200);
69+
response.getOutputStream().flush();
70+
response.getOutputStream().close();
71+
baseRequest.setHandled(true);
7372
}
7473
};
7574
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp