Skip to content

Commit 165b838

Browse files
garyrussellartembilan
authored andcommitted
GH-1237: RCFB Close key/trust store input streams
Resolves #1237 **cherry-pick to 2.2.x, 2.1.x, 1.7.x**
1 parent 5b8b3dc commit 165b838

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.amqp.rabbit.connection;
1818

1919
import java.io.IOException;
20+
import java.io.InputStream;
2021
import java.net.URI;
2122
import java.net.URISyntaxException;
2223
import java.security.KeyManagementException;
@@ -816,7 +817,9 @@ protected KeyManager[] configureKeyManagers() throws KeyStoreException, IOExcept
816817
Resource resource = this.keyStoreResource != null ? this.keyStoreResource
817818
: this.resourceLoader.getResource(keyStoreName);
818819
KeyStore ks = KeyStore.getInstance(storeType);
819-
ks.load(resource.getInputStream(), keyPassphrase);
820+
try (InputStream inputStream = resource.getInputStream()) {
821+
ks.load(inputStream, keyPassphrase);
822+
}
820823
KeyManagerFactory kmf = KeyManagerFactory.getInstance(this.keyStoreAlgorithm);
821824
kmf.init(ks, keyPassphrase);
822825
keyManagers = kmf.getKeyManagers();
@@ -839,7 +842,9 @@ protected TrustManager[] configureTrustManagers()
839842
Resource resource = this.trustStoreResource != null ? this.trustStoreResource
840843
: this.resourceLoader.getResource(trustStoreName);
841844
KeyStore tks = KeyStore.getInstance(storeType);
842-
tks.load(resource.getInputStream(), trustPassphrase);
845+
try (InputStream inputStream = resource.getInputStream()) {
846+
tks.load(inputStream, trustPassphrase);
847+
}
843848
TrustManagerFactory tmf = TrustManagerFactory.getInstance(this.trustStoreAlgorithm);
844849
tmf.init(tks);
845850
trustManagers = tmf.getTrustManagers();

0 commit comments

Comments
 (0)