From adf406c2696b749ea96a155dd0d1ebd0804d01d8 Mon Sep 17 00:00:00 2001
From: Zachary DeLuca <zadeluca@gmail.com>
Date: Wed, 15 Nov 2017 12:29:13 -0500
Subject: [PATCH] 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
---
 .../rabbit/connection/RabbitConnectionFactoryBean.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java
index 1da8d44b..b4f18a41 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,6 +69,7 @@ import com.rabbitmq.client.impl.nio.NioParams;
  * @author Arnaud Cogoluègnes
  * @author Hareendran
  * @author Artem Bilan
+ * @author Zachary DeLuca
  *
  * @since 1.4
  */
@@ -636,11 +637,11 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
 			String keyStoreType = getKeyStoreType();
 			String trustStoreType = getTrustStoreType();
 			char[] keyPassphrase = null;
-			if (StringUtils.hasText(keyStorePassword)) {
+			if (keyStorePassword != null) {
 				keyPassphrase = keyStorePassword.toCharArray();
 			}
 			char[] trustPassphrase = null;
-			if (StringUtils.hasText(trustStorePassword)) {
+			if (trustStorePassword != null) {
 				trustPassphrase = trustStorePassword.toCharArray();
 			}
 			KeyManager[] keyManagers = null;