infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-10 02:18:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

8228970: AssertionError in ResponseSubscribers$HttpResponseInputStream

Browse Source 
HttpResponseInputStream::read(byte[],int,int) now implements the same check than the InputStream::read(byte[],int,int).

Reviewed-by: prappo, chegar, dfuchs
This commit is contained in:
Patrick Concannon 2019-08-08 18:44:11 +01:00 committed by Daniel Fuchs
parent b036071125
commit 9f7cbf60e4
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.net.http/share/classes/jdk/internal/net/http/ResponseSubscribers.java
View File

@ -438,6 +438,10 @@ public class ResponseSubscribers {
@Override
public int read(byte[] bytes, int off, int len) throws IOException {
Objects.checkFromIndexSize(off, len, bytes.length);
if (len == 0) {
return 0;
}
// get the buffer to read from, possibly blocking if
// none is available
ByteBuffer buffer;

34
test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,13 +40,18 @@ import java.util.concurrent.atomic.AtomicLong;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
/*
* @test
* @bug 8197564 8228970
* @summary Simple smoke test for BodySubscriber.asInputStream();
* @run testng/othervm HttpResponseInputStreamTest
* @author daniel fuchs
*/
public class HttpResponseInputStreamTest {
static final Class<NullPointerException> NPE = NullPointerException.class;
static final Class<IndexOutOfBoundsException> OOB = IndexOutOfBoundsException.class;
static class TestException extends IOException {}
@ -183,6 +188,33 @@ public class HttpResponseInputStreamTest {
}
}
@Test
public static void testReadParameters() throws InterruptedException, ExecutionException, IOException {
BodySubscriber<InputStream> isb = BodySubscribers.ofInputStream();
InputStream is = isb.getBody().toCompletableFuture().get();
Throwable ex;
// len == 0
assertEquals(is.read(new byte[16], 0, 0), 0);
assertEquals(is.read(new byte[16], 16, 0), 0);
// index == -1
ex = expectThrows(OOB, () -> is.read(new byte[16], -1, 10));
System.out.println("OutOfBoundsException thrown as expected: " + ex);
// large offset
ex = expectThrows(OOB, () -> is.read(new byte[16], 17, 10));
System.out.println("OutOfBoundsException thrown as expected: " + ex);
ex = expectThrows(OOB, () -> is.read(new byte[16], 10, 10));
System.out.println("OutOfBoundsException thrown as expected: " + ex);
// null value
ex = expectThrows(NPE, () -> is.read(null, 0, 10));
System.out.println("NullPointerException thrown as expected: " + ex);
}
@Test
public static void testSubscribeAndClose()
throws InterruptedException, ExecutionException