stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8268023: Improve diagnostic for HandshakeFailureTest

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Daniel Fuchs 2021-06-01 17:55:36 +00:00
parent 9d8ad2ed62
commit d4b4caecad
2 changed files with 5 additions and 3 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/Http2Connection.java
View File

@ -468,7 +468,9 @@ class Http2Connection {
Function<String, CompletableFuture<Void>> checkAlpnCF = (alpn) -> { Function<String, CompletableFuture<Void>> checkAlpnCF = (alpn) -> {
CompletableFuture<Void> cf = new MinimalFuture<>(); CompletableFuture<Void> cf = new MinimalFuture<>();
SSLEngine engine = aconn.getEngine(); SSLEngine engine = aconn.getEngine();
assert Objects.equals(alpn, engine.getApplicationProtocol()); String engineAlpn = engine.getApplicationProtocol();
assert Objects.equals(alpn, engineAlpn)
: "alpn: %s, engine: %s".formatted(alpn, engineAlpn);
DEBUG_LOGGER.log("checkSSLConfig: alpn: %s", alpn ); DEBUG_LOGGER.log("checkSSLConfig: alpn: %s", alpn );

4
test/jdk/java/net/httpclient/HandshakeFailureTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -266,7 +266,7 @@ public class HandshakeFailureTest {
original.printStackTrace(System.out); original.printStackTrace(System.out);
throw new RuntimeException( throw new RuntimeException(
"Not found expected SSLHandshakeException in " "Not found expected SSLHandshakeException in "
+ original); + original, original);
} }
/** Common super type for PlainServer and SSLServer. */ /** Common super type for PlainServer and SSLServer. */