When a constructor that gets a resource fails, it might prevent the
resource from being closed. By giving the resource explicitly to the
try-with-resources, this is prevented.
Change-Id: I2f8a50773de71f699c00729b51048892a44033e6
System.out.println("Upgrade 32: loading " + f);
if (f.exists()) {
StringBuilder sb = new StringBuilder();
System.out.println("Upgrade 32: loading " + f);
if (f.exists()) {
StringBuilder sb = new StringBuilder();
- try (Reader r = new InputStreamReader(new FileInputStream(f), "UTF-8")) {
+ try (FileInputStream fis = new FileInputStream(f); Reader r = new InputStreamReader(fis, "UTF-8")) {
int len;
char[] buf = new char[4096];
while ((len = r.read(buf)) > 0) {
int len;
char[] buf = new char[4096];
while ((len = r.read(buf)) > 0) {
ocspCsr.delete();
ocspCrt.delete();
String csr = PEM.encode("CERTIFICATE REQUEST", p10.getEncoded());
ocspCsr.delete();
ocspCrt.delete();
String csr = PEM.encode("CERTIFICATE REQUEST", p10.getEncoded());
- try (Writer w = new OutputStreamWriter(new FileOutputStream(ocspCsr), "UTF-8")) {
+ try (FileOutputStream fos = new FileOutputStream(ocspCsr); Writer w = new OutputStreamWriter(fos, "UTF-8")) {
protected void tryReload() {
if (source != null && lastLoaded < source.lastModified()) {
System.out.println("Reloading template.... " + source);
protected void tryReload() {
if (source != null && lastLoaded < source.lastModified()) {
System.out.println("Reloading template.... " + source);
- try (InputStreamReader r = new InputStreamReader(new FileInputStream(source), "UTF-8")) {
+ try (FileInputStream fis = new FileInputStream(source); InputStreamReader r = new InputStreamReader(fis, "UTF-8")) {
data = parse(r).getBlock(null);
r.close();
lastLoaded = source.lastModified() + 1000;
data = parse(r).getBlock(null);
r.close();
lastLoaded = source.lastModified() + 1000;
throw new Error("Public Suffix List could not be loaded.");
}
throw new Error("Public Suffix List could not be loaded.");
}
- try (BufferedReader br = new BufferedReader(new InputStreamReader(res, "UTF-8"))) {
+ try (InputStreamReader isr = new InputStreamReader(res, "UTF-8"); BufferedReader br = new BufferedReader(isr)) {
return new PublicSuffixes(br);
}
}
return new PublicSuffixes(br);
}
}