2828
2929/**
3030 * Options to configure SSL options for the connections kept to Redis servers.
31+ *
32+ * @author Mark Paluch
3133 */
3234public class SslOptions {
3335
@@ -274,11 +276,23 @@ public Builder truststore(Resource resource, char[] truststorePassword) {
274276 return this ;
275277 }
276278
279+ /**
280+ * Sets a configured {@link SSLParameters}.
281+ *
282+ * @param sslParameters a {@link SSLParameters} object.
283+ * @return {@code this}
284+ */
277285 public Builder sslParameters (SSLParameters sslParameters ) {
278286 this .sslParameters = sslParameters ;
279287 return this ;
280288 }
281289
290+ /**
291+ * Sets the {@link SslVerifyMode}.
292+ *
293+ * @param sslVerifyMode the {@link SslVerifyMode}.
294+ * @return {@code this}
295+ */
282296 public Builder sslVerifyMode (SslVerifyMode sslVerifyMode ) {
283297 this .sslVerifyMode = sslVerifyMode ;
284298 return this ;
@@ -316,6 +330,7 @@ public SslOptions build() {
316330 */
317331 public SSLContext createSslContext () throws IOException , GeneralSecurityException {
318332
333+ KeyManager [] keyManagers = null ;
319334 TrustManager [] trustManagers = null ;
320335
321336 if (sslVerifyMode == SslVerifyMode .FULL ) {
@@ -326,7 +341,6 @@ public SSLContext createSslContext() throws IOException, GeneralSecurityExceptio
326341 trustManagers = new TrustManager [] { INSECURE_TRUST_MANAGER };
327342 }
328343
329- KeyManager [] keyManagers = null ;
330344 if (keystoreResource != null ) {
331345
332346 KeyStore keyStore = KeyStore .getInstance (keyStoreType );
@@ -339,9 +353,7 @@ public SSLContext createSslContext() throws IOException, GeneralSecurityExceptio
339353 keyManagers = keyManagerFactory .getKeyManagers ();
340354 }
341355
342- if (trustManagers != null ) {
343- // already processed
344- } else if (truststoreResource != null ) {
356+ if (trustManagers == null && truststoreResource != null ) {
345357
346358 KeyStore trustStore = KeyStore .getInstance (trustStoreType );
347359 try (InputStream truststoreStream = truststoreResource .get ()) {
0 commit comments