From 165b838c3ac7a65cd45fdd65b3dda3eacfc34063 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**
---
 .../rabbit/connection/RabbitConnectionFactoryBean.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 f168a95e..cd73eb62 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
@@ -17,6 +17,7 @@
 package org.springframework.amqp.rabbit.connection;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.KeyManagementException;
@@ -816,7 +817,9 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
 			Resource resource = this.keyStoreResource != null ? this.keyStoreResource
 					: this.resourceLoader.getResource(keyStoreName);
 			KeyStore ks = KeyStore.getInstance(storeType);
-			ks.load(resource.getInputStream(), keyPassphrase);
+			try (InputStream inputStream = resource.getInputStream()) {
+				ks.load(inputStream, keyPassphrase);
+			}
 			KeyManagerFactory kmf = KeyManagerFactory.getInstance(this.keyStoreAlgorithm);
 			kmf.init(ks, keyPassphrase);
 			keyManagers = kmf.getKeyManagers();
@@ -839,7 +842,9 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
 			Resource resource = this.trustStoreResource != null ? this.trustStoreResource
 					: this.resourceLoader.getResource(trustStoreName);
 			KeyStore tks = KeyStore.getInstance(storeType);
-			tks.load(resource.getInputStream(), trustPassphrase);
+			try (InputStream inputStream = resource.getInputStream()) {
+				tks.load(inputStream, trustPassphrase);
+			}
 			TrustManagerFactory tmf = TrustManagerFactory.getInstance(this.trustStoreAlgorithm);
 			tmf.init(tks);
 			trustManagers = tmf.getTrustManagers();