chg: manage more resources explicitly

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

diff --git a/src/club/wpia/gigi/database/DatabaseConnection.java b/src/club/wpia/gigi/database/DatabaseConnection.java
index 20125a81e0f54420e79508244eae7d05bf0fbdad..51e58728999046e695a2e09b3d4197c747d6b245 100644 (file)
--- a/src/club/wpia/gigi/database/DatabaseConnection.java
+++ b/src/club/wpia/gigi/database/DatabaseConnection.java
@@ -53,7 +53,7 @@ public class DatabaseConnection {
             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) {

diff --git a/src/club/wpia/gigi/ocsp/OCSPIssuerManager.java b/src/club/wpia/gigi/ocsp/OCSPIssuerManager.java
index c83c3311c4635fdcadda1d77e8a1c6d93cd4f412..40e6d67c5ca74c0692de6829d90bf7f7c4d51092 100644 (file)
--- a/src/club/wpia/gigi/ocsp/OCSPIssuerManager.java
+++ b/src/club/wpia/gigi/ocsp/OCSPIssuerManager.java
@@ -194,7 +194,7 @@ public class OCSPIssuerManager implements Runnable {
         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")) {
             w.write(csr);
         }
     }

diff --git a/src/club/wpia/gigi/output/template/Template.java b/src/club/wpia/gigi/output/template/Template.java
index d3f5a011aa6448a8e2aae66e5a7055eb6942e844..ad53ac2ed4492ccbff4ec54598896d328fdc41b7 100644 (file)
--- a/src/club/wpia/gigi/output/template/Template.java
+++ b/src/club/wpia/gigi/output/template/Template.java
@@ -237,7 +237,7 @@ public class Template implements Outputable {
     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;

diff --git a/src/club/wpia/gigi/util/PublicSuffixes.java b/src/club/wpia/gigi/util/PublicSuffixes.java
index 401502f72f03df0d8aaf54d4bfd31cdb8ef47a93..a86cbbb43b3a030fcef031859985157f4a2136b5 100644 (file)
--- a/src/club/wpia/gigi/util/PublicSuffixes.java
+++ b/src/club/wpia/gigi/util/PublicSuffixes.java
@@ -26,7 +26,7 @@ public class PublicSuffixes {
             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);
         }
     }