*/
private void scanAndUpdateCAs(File f, KeyStore keys, Map<String, OCSPIssuer> toServe) {
if (f.isDirectory()) {
- for (File f1 : f.listFiles()) {
- scanAndUpdateCAs(f1, keys, toServe);
+ File[] list = f.listFiles();
+ if (list == null) {
+ return;
+ }
+
+ for (File file : list) {
+ scanAndUpdateCAs(file, keys, toServe);
}
+
return;
}
if ( !f.getName().equals("ca.crt")) {
if (ks.length() == 0) {
keys.load(null);
} else {
- keys.load(new FileInputStream(ks), "pass".toCharArray());
+ try (FileInputStream ks_file = new FileInputStream(ks)) {
+ keys.load(ks_file, "pass".toCharArray());
+ }
}
} else {
// assuming ocsp is disabled
Map<String, OCSPIssuer> toServe = new HashMap<>();
scanAndUpdateCAs(f, keys, toServe);
- try {
- keys.store(new FileOutputStream(ks), "pass".toCharArray());
+ try (FileOutputStream ks_file = new FileOutputStream(ks)) {
+ keys.store(ks_file, "pass".toCharArray());
} catch (GeneralSecurityException e) {
throw new Error(e);
} catch (IOException e) {