From c4832cd9d989788f32dc1321d3e4c72bffa3587a Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Sat, 1 Apr 2017 20:38:33 +0200 Subject: [PATCH] Only support using Conscrypt on Java8+ Motivation: 1419f5b601ec7f50938a5e745ec2312f881a580f added support for conscrypt but the CI started to fail when running tests with java7 as conscrypt is compiled with java8. Modifications: Only support conscrypt on Java8+ Result: CI not fails anymore. --- .../java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java index 92437f8fa3..8e7a5447a3 100644 --- a/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java +++ b/handler/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java @@ -29,6 +29,8 @@ import java.util.List; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLException; + +import io.netty.util.internal.PlatformDependent; import org.conscrypt.Conscrypt; import org.conscrypt.HandshakeListener; @@ -42,7 +44,7 @@ abstract class ConscryptAlpnSslEngine extends JdkSslEngine { * Indicates whether or not conscrypt is available on the current system. */ static boolean isAvailable() { - return ENGINES_CLASS != null; + return ENGINES_CLASS != null && PlatformDependent.javaVersion() >= 8; } static boolean isEngineSupported(SSLEngine engine) {