From 1740f16bf67405d2bf4a8c91482f3d0cc17e160c Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 19 Jul 2022 18:18:01 -0700 Subject: [PATCH] Adapt to API changes in Apache Geode 1.15.0. --- .../geode/cache/service/Jetty11HttpService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-geode-project/apache-geode-jetty11/src/main/java/org/springframework/geode/cache/service/Jetty11HttpService.java b/spring-geode-project/apache-geode-jetty11/src/main/java/org/springframework/geode/cache/service/Jetty11HttpService.java index 96e9666a..375046d2 100644 --- a/spring-geode-project/apache-geode-jetty11/src/main/java/org/springframework/geode/cache/service/Jetty11HttpService.java +++ b/spring-geode-project/apache-geode-jetty11/src/main/java/org/springframework/geode/cache/service/Jetty11HttpService.java @@ -113,6 +113,12 @@ public class Jetty11HttpService implements HttpService { return object; } + private static String[] toArray(String commaDelimitedString) { + return StringUtils.isNotBlank(commaDelimitedString) + ? commaDelimitedString.split(",") + : new String[0]; + } + private static Supplier toSupplier(Supplier lambda) { return lambda; } @@ -321,7 +327,7 @@ public class Jetty11HttpService implements HttpService { .filter(this::isSslCiphersConfigured) .ifPresent(ciphers -> { serverSslContextFactory.setExcludeCipherSuites(); - serverSslContextFactory.setIncludeCipherSuites(SSLUtil.readArray(ciphers)); + serverSslContextFactory.setIncludeCipherSuites(toArray(ciphers)); }); serverSslContextFactory.setNeedClientAuth(sslConfiguration.isRequireAuth());