From efcba3a83af50b458e3561ce8af3e0b0a87c6b59 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 5 Aug 2020 11:34:54 -0400
Subject: [PATCH] GH-1237: RCFB Close key/trust store input streams

Resolves https://github.com/spring-projects/spring-amqp/issues/1237

**cherry-pick to 2.2.x, 2.1.x, 1.7.x**

(cherry picked from commit 165b838c3ac7a65cd45fdd65b3dda3eacfc34063)

# Conflicts:
#	spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitConnectionFactoryBean.java
---
 .../RabbitConnectionFactoryBean.java          | 19 ++++++++++++++++---
 1 file changed, 16 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 7f9bd495..41366d99 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
@@ -16,6 +16,7 @@
 
 package org.springframework.amqp.rabbit.connection;
 
+import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -72,7 +73,7 @@ import com.rabbitmq.client.impl.nio.NioParams;
  *
  * @author Gary Russell
  * @author Heath Abelson
- * @author Arnaud Cogoluègnes
+ * @author Arnaud Cogoluegnes
  * @author Hareendran
  * @author Artem Bilan
  * @author Zachary DeLuca
@@ -731,7 +732,13 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
 				Resource keyStoreResource = this.keyStoreResource != null ? this.keyStoreResource
 						: resolver.getResource(keyStoreName);
 				KeyStore ks = KeyStore.getInstance(keyStoreType);
-				ks.load(keyStoreResource.getInputStream(), keyPassphrase);
+				InputStream inputStream = keyStoreResource.getInputStream();
+				try {
+					ks.load(inputStream, keyPassphrase);
+				}
+				finally {
+					inputStream.close();
+				}
 				KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
 				kmf.init(ks, keyPassphrase);
 				keyManagers = kmf.getKeyManagers();
@@ -740,7 +747,13 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
 				Resource trustStoreResource = this.trustStoreResource != null ? this.trustStoreResource
 						: resolver.getResource(trustStoreName);
 				KeyStore tks = KeyStore.getInstance(trustStoreType);
-				tks.load(trustStoreResource.getInputStream(), trustPassphrase);
+				InputStream inputStream = trustStoreResource.getInputStream();
+				try {
+					tks.load(inputStream, trustPassphrase);
+				}
+				finally {
+					inputStream.close();
+				}
 				TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
 				tmf.init(tks);
 				trustManagers = tmf.getTrustManagers();