Merge branch '2.2.x' into 2.3.x

See gh-24052

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizer.java

@@ -148,7 +148,9 @@ private void configureSslTrustStore(AbstractHttp11JsseProtocol<?> protocol, Ssl
 				throw new WebServerException("Could not load trust store: " + ex.getMessage(), ex);
 			}
 		}
-		protocol.setTruststorePass(ssl.getTrustStorePassword());
+		if (ssl.getTrustStorePassword() != null) {
+			protocol.setTruststorePass(ssl.getTrustStorePassword());
+		}
 		if (ssl.getTrustStoreType() != null) {
 			protocol.setTruststoreType(ssl.getTrustStoreType());
 		}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java

@@ -206,6 +206,17 @@ void keyPasswordIsNotSetWhenNull() {
 		assertThat(protocol.getKeyPass()).isEqualTo("password");
 	}
 
+	@Test
+	void trustStorePasswordIsNotSetWhenNull() {
+		Http11NioProtocol protocol = (Http11NioProtocol) this.tomcat.getConnector().getProtocolHandler();
+		protocol.setTruststorePass("password");
+		Ssl ssl = new Ssl();
+		ssl.setKeyStore("src/test/resources/test.jks");
+		ssl.setTrustStore("src/test/resources/test.jks");
+		new SslConnectorCustomizer(ssl, null).customize(this.tomcat.getConnector());
+		assertThat(protocol.getTruststorePass()).isEqualTo("password");
+	}
+
 	private KeyStore loadStore() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
 		KeyStore keyStore = KeyStore.getInstance("JKS");
 		Resource resource = new ClassPathResource("test.jks");