Skip to content

Commit 01d45f8

Browse files
authored
Merge pull request #354 from michail-nikolaev/close-files
Close keystore file
2 parents e3d4ab1 + 4332286 commit 01d45f8

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/main/java/ru/yandex/clickhouse/util/ClickHouseHttpClientBuilder.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,16 @@ private KeyStore getKeyStore()
189189
.getSslRootCertificate() + "'", ex);
190190
}
191191
}
192-
CertificateFactory cf = CertificateFactory.getInstance("X.509");
193-
Iterator<? extends Certificate> caIt = cf.generateCertificates(caInputStream).iterator();
194-
StreamUtils.close(caInputStream);
195-
for (int i = 0; caIt.hasNext(); i++) {
196-
ks.setCertificateEntry("cert" + i, caIt.next());
197-
}
198192

199-
return ks;
193+
try {
194+
CertificateFactory cf = CertificateFactory.getInstance("X.509");
195+
Iterator<? extends Certificate> caIt = cf.generateCertificates(caInputStream).iterator();
196+
for (int i = 0; caIt.hasNext(); i++) {
197+
ks.setCertificateEntry("cert" + i, caIt.next());
198+
}
199+
return ks;
200+
} finally {
201+
caInputStream.close();
202+
}
200203
}
201-
202204
}

0 commit comments

Comments
 (0)