From 727dd12852290f48840a8aeac91c37823112bdc7 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 3 May 2016 22:31:13 +0900 Subject: [PATCH] Fix customization of Jetty's SSL trust store See gh-5852 --- .../embedded/jetty/JettyEmbeddedServletContainerFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 1467107439..5024b1b71a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -259,7 +259,7 @@ public class JettyEmbeddedServletContainerFactory if (getSslStoreProvider() != null) { try { factory.setKeyStore(getSslStoreProvider().getKeyStore()); - factory.setTrustStore(getSslStoreProvider().getKeyStore()); + factory.setTrustStore(getSslStoreProvider().getTrustStore()); } catch (Exception ex) { throw new IllegalStateException("Unable to set SSL store", ex);