1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8174833: java/net/httpclient/http2/BasicTest.java always fails but always report success

Browse Source 
Reviewed-by: michaelm
This commit is contained in:
Daniel Fuchs 2017-02-13 17:18:48 +00:00
parent 9d5439dda1
commit 28fc67ce7e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/test/java/net/httpclient/http2/BasicTest.java
View File

@ -94,6 +94,7 @@ public class BasicTest {
} catch (Throwable tt) { } catch (Throwable tt) {
System.err.println("tt caught"); System.err.println("tt caught");
tt.printStackTrace(); tt.printStackTrace();
throw tt;
} finally { } finally {
httpServer.stop(); httpServer.stop();
httpsServer.stop(); httpsServer.stop();
@ -223,7 +224,7 @@ public class BasicTest {
CompletableFuture[] responses = new CompletableFuture[LOOPS]; CompletableFuture[] responses = new CompletableFuture[LOOPS];
final Path source = TestUtil.getAFile(FILESIZE); final Path source = TestUtil.getAFile(FILESIZE);
HttpRequest request = HttpRequest.newBuilder(uri) HttpRequest request = HttpRequest.newBuilder(uri)
.POST(fromFile(tempFile())) .POST(fromFile(source))
.build(); .build();
for (int i = 0; i < LOOPS; i++) { for (int i = 0; i < LOOPS; i++) {
responses[i] = client.sendAsync(request, asFile(tempFile())) responses[i] = client.sendAsync(request, asFile(tempFile()))

4
jdk/test/java/net/httpclient/http2/server/Http2TestServerConnection.java
View File

@ -392,9 +392,11 @@ public class Http2TestServerConnection {
//System.err.println ("Stream window size = " + winsize); //System.err.println ("Stream window size = " + winsize);
final InputStream bis; final InputStream bis;
if (endStreamReceived) { if (endStreamReceived && queue.size() == 0) {
System.err.println("Server: got END_STREAM for stream " + streamid);
bis = NullInputStream.INSTANCE; bis = NullInputStream.INSTANCE;
} else { } else {
System.err.println("Server: creating input stream for stream " + streamid);
bis = new BodyInputStream(queue, streamid, this); bis = new BodyInputStream(queue, streamid, this);
} }
try (bis; try (bis;