andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix invokeExact(...) usage in JdkAlpnSslUtils (#10471)

Browse Source 
Motivation:

fd0d06e introduced the usage of MethodHandles and so also introduced some usages of invokeExact(...). Unfortunally when calling this method we missed to also cast the return value in the static init block of JdkAlpnSslUtils which lead to an exception to be thrown as the JVM did assume the return value is void which is not true.

Modifications:

Correctly cast the return value of invokeExact(...)

Result:

ALPN can be used in master with JDK again
This commit is contained in:
Norman Maurer 2020-08-11 16:04:15 +02:00 committed by GitHub
parent 1208f27070
commit 6aa30b2b6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
handler/src/main/java/io/netty/handler/ssl/JdkAlpnSslUtils.java
View File

@ -56,12 +56,14 @@ final class JdkAlpnSslUtils {
AccessController.doPrivileged((PrivilegedExceptionAction<MethodHandle>) () ->
lookup.findVirtual(SSLEngine.class, "getHandshakeApplicationProtocol",
MethodType.methodType(String.class)));
getHandshakeApplicationProtocol.invokeExact(engine);
// Invoke and specify the return type so the compiler doesnt try to use void
String getHandshakeApplicationProtocolRes = (String) getHandshakeApplicationProtocol.invokeExact(engine);
getApplicationProtocol = AccessController.doPrivileged((PrivilegedExceptionAction<MethodHandle>) () ->
lookup.findVirtual(SSLEngine.class, "getApplicationProtocol",
MethodType.methodType(String.class)));
getApplicationProtocol.invokeExact(engine);
// Invoke and specify the return type so the compiler doesnt try to use void
String getApplicationProtocolRes = (String) getApplicationProtocol.invokeExact(engine);
setApplicationProtocols = AccessController.doPrivileged((PrivilegedExceptionAction<MethodHandle>) () ->
lookup.findVirtual(SSLParameters.class, "setApplicationProtocols",
@ -79,7 +81,11 @@ final class JdkAlpnSslUtils {
AccessController.doPrivileged((PrivilegedExceptionAction<MethodHandle>) () ->
lookup.findVirtual(SSLEngine.class, "getHandshakeApplicationProtocolSelector",
MethodType.methodType(BiFunction.class)));
getHandshakeApplicationProtocolSelector.invokeExact(engine);
// Invoke and specify the return type so the compiler doesnt try to use void
@SuppressWarnings("unchecked")
BiFunction<SSLEngine, List<String>, String> getHandshakeApplicationProtocolSelectorRes =
(BiFunction<SSLEngine, List<String>, String>)
getHandshakeApplicationProtocolSelector.invokeExact(engine);
} catch (Throwable t) {
int version = PlatformDependent.javaVersion();
if (version >= 9) {