diff --git a/core/src/main/java/tech/ydb/core/ssl/YandexTrustManagersProvider.java b/core/src/main/java/tech/ydb/core/ssl/YandexTrustManagersProvider.java index 3a2dc24f2..53554e88f 100644 --- a/core/src/main/java/tech/ydb/core/ssl/YandexTrustManagersProvider.java +++ b/core/src/main/java/tech/ydb/core/ssl/YandexTrustManagersProvider.java @@ -1,6 +1,7 @@ package tech.ydb.core.ssl; import java.io.IOException; +import java.io.InputStream; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; @@ -16,7 +17,7 @@ import javax.net.ssl.X509TrustManager; final class YandexTrustManagersProvider { - private static final String JSK_YANDEX_CA_STORE = "certificates/YandexAllCAs.pkcs"; + private static final String YANDEX_CA_STORE = "certificates/YandexAllCAs.pkcs"; private static final String STORE_PASSWORD = "yandex"; private final TrustManager[] trustManagers; @@ -51,8 +52,9 @@ private List getDefaultTrustManagers() throws NoSuchAlgorithmExcep private List getCustomTrustManagers() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException { KeyStore keyStore = KeyStore.getInstance("PKCS12"); - keyStore.load(YandexTrustManagersProvider.class.getClassLoader().getResourceAsStream(JSK_YANDEX_CA_STORE), - STORE_PASSWORD.toCharArray()); + try (InputStream is = YandexTrustManagersProvider.class.getClassLoader().getResourceAsStream(YANDEX_CA_STORE)) { + keyStore.load(is, STORE_PASSWORD.toCharArray()); + } return getTrustManagersFromKeyStore(keyStore); } diff --git a/core/src/main/java/tech/ydb/core/utils/Version.java b/core/src/main/java/tech/ydb/core/utils/Version.java index 5d0b2a0ac..c5efd173f 100644 --- a/core/src/main/java/tech/ydb/core/utils/Version.java +++ b/core/src/main/java/tech/ydb/core/utils/Version.java @@ -13,9 +13,8 @@ private Version() { } public static Optional getVersion() { - try { + try (InputStream in = Version.class.getResourceAsStream("/ydb_sdk_version.properties")) { Properties prop = new Properties(); - InputStream in = Version.class.getResourceAsStream("/ydb_sdk_version.properties"); prop.load(in); return Optional.ofNullable(prop.getProperty("version")); } catch (Exception ex) {