# HG changeset patch # User chegar # Date 1510745994 0 # Node ID 70738768515a9f23577c62e1461d8de292b77d07 # Parent 4f699653026b4fa39cc4d452a0627c0af58ad354 http-client-branch: spec clarifications and minor fix to sendXXX methods diff -r 4f699653026b -r 70738768515a src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java --- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java Tue Nov 14 16:28:52 2017 +0000 +++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java Wed Nov 15 11:39:54 2017 +0000 @@ -385,7 +385,7 @@ * @param req the request * @param responseBodyHandler the response body handler * @return the response body - * @throws java.io.IOException if an I/O error occurs when sending or receiving + * @throws IOException if an I/O error occurs when sending or receiving * @throws InterruptedException if the operation is interrupted * @throws IllegalArgumentException if the request method is not supported * @throws SecurityException If a security manager has been installed @@ -402,11 +402,16 @@ * Sends the given request asynchronously using this client and the given * response handler. * - *

The returned completable future is completed with a SecurityException - * if a security manager has been installed and it denies {@link - * java.net.URLPermission access} to the URI in the given request, or proxy - * if one is configured. See HttpRequest for further information about - * security checks. + *

The returned completable future completes exceptionally with: + *

* * @param the response body type * @param req the request @@ -420,11 +425,16 @@ * Sends the given request asynchronously using this client and the given * multi response handler. * - *

The returned completable future is completed with a SecurityException - * if a security manager has been installed and it denies {@link - * java.net.URLPermission access} to the URI in the given request, or proxy - * if one is configured. See HttpRequest for further information about - * security checks. + *

The returned completable future completes exceptionally with: + *

* * @param a type representing the aggregated results * @param a type representing all of the response bodies diff -r 4f699653026b -r 70738768515a src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java --- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java Tue Nov 14 16:28:52 2017 +0000 +++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java Wed Nov 15 11:39:54 2017 +0000 @@ -55,6 +55,7 @@ import java.util.TreeSet; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; +import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; @@ -390,9 +391,9 @@ throws IOException, InterruptedException { try { - return sendAsync(req, responseHandler).join(); - } catch (CompletionException ce) { - Throwable t = ce.getCause(); + return sendAsync(req, responseHandler).get(); + } catch (ExecutionException e) { + Throwable t = e.getCause(); if (t instanceof Error) throw (Error)t; if (t instanceof RuntimeException) diff -r 4f699653026b -r 70738768515a test/jdk/java/net/httpclient/InterruptedBlockingSend.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/jdk/java/net/httpclient/InterruptedBlockingSend.java Wed Nov 15 11:39:54 2017 +0000 @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2017, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.net.ServerSocket; +import java.net.URI; +import jdk.incubator.http.HttpClient; +import jdk.incubator.http.HttpRequest; +import static java.lang.System.out; +import static jdk.incubator.http.HttpResponse.BodyHandler.discard; + +/** + * @test + * @summary Basic test for interrupted blocking send + */ + +public class InterruptedBlockingSend { + + static volatile Throwable throwable; + + public static void main(String[] args) throws Exception { + HttpClient client = HttpClient.newHttpClient(); + try (ServerSocket ss = new ServerSocket(0, 20)) { + int port = ss.getLocalPort(); + URI uri = new URI("http://127.0.0.1:" + port + "/"); + + HttpRequest request = HttpRequest.newBuilder(uri).build(); + + Thread t = new Thread(() -> { + try { + client.send(request, discard(null)); + } catch (InterruptedException e) { + throwable = e; + } catch (Throwable th) { + throwable = th; + } + }); + t.start(); + Thread.sleep(5000); + t.interrupt(); + t.join(); + + if (!(throwable instanceof InterruptedException)) { + throw new RuntimeException("Expected InterruptedException, got " + throwable); + } else { + out.println("Caught expected InterruptedException: " + throwable); + } + } + } +}