From d4b4caecad58998f8855a64436b1ebd47f7e7bfb Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Tue, 1 Jun 2021 17:55:36 +0000 Subject: [PATCH] 8268023: Improve diagnostic for HandshakeFailureTest Reviewed-by: chegar --- .../share/classes/jdk/internal/net/http/Http2Connection.java | 4 +++- test/jdk/java/net/httpclient/HandshakeFailureTest.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java index 36a2e2a6146..639f9483274 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java @@ -468,7 +468,9 @@ class Http2Connection { Function> checkAlpnCF = (alpn) -> { CompletableFuture cf = new MinimalFuture<>(); 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 ); diff --git a/test/jdk/java/net/httpclient/HandshakeFailureTest.java b/test/jdk/java/net/httpclient/HandshakeFailureTest.java index 491f473058d..d111d1f7dc3 100644 --- a/test/jdk/java/net/httpclient/HandshakeFailureTest.java +++ b/test/jdk/java/net/httpclient/HandshakeFailureTest.java @@ -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. * * This code is free software; you can redistribute it and/or modify it @@ -266,7 +266,7 @@ public class HandshakeFailureTest { original.printStackTrace(System.out); throw new RuntimeException( "Not found expected SSLHandshakeException in " - + original); + + original, original); } /** Common super type for PlainServer and SSLServer. */