Skip to content

Commit adf406c

Browse files
zadelucaartembilan
authored andcommitted
AMQP-783: Allow blank key/trust store passwords
JIRA: https://jira.spring.io/browse/AMQP-783 **Cherry-pick to 1.7.x** # Conflicts: # spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java
1 parent c320c24 commit adf406c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -69,6 +69,7 @@
6969
* @author Arnaud Cogoluègnes
7070
* @author Hareendran
7171
* @author Artem Bilan
72+
* @author Zachary DeLuca
7273
*
7374
* @since 1.4
7475
*/
@@ -636,11 +637,11 @@ protected void setUpSSL() throws Exception {
636637
String keyStoreType = getKeyStoreType();
637638
String trustStoreType = getTrustStoreType();
638639
char[] keyPassphrase = null;
639-
if (StringUtils.hasText(keyStorePassword)) {
640+
if (keyStorePassword != null) {
640641
keyPassphrase = keyStorePassword.toCharArray();
641642
}
642643
char[] trustPassphrase = null;
643-
if (StringUtils.hasText(trustStorePassword)) {
644+
if (trustStorePassword != null) {
644645
trustPassphrase = trustStorePassword.toCharArray();
645646
}
646647
KeyManager[] keyManagers = null;

0 commit comments

Comments
 (0)