try-with-resources for Http InputStream.

diff --git a/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java b/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
index f623ed9..a181bb6 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
+++ b/src/main/java/jp/sfjp/jindolf/net/ServerAccess.java
@@ -294,10 +294,11 @@ public class ServerAccess{
             return null;
         }
 
-        InputStream stream = TallyInputStream.getInputStream(connection);
-        DecodedContent html = downloadHTMLStream(stream);
+        DecodedContent html;
+        try(InputStream is = TallyInputStream.getInputStream(connection)){
+            html = downloadHTMLStream(is);
+        }
 
-        stream.close();
         connection.disconnect();
 
         HtmlSequence hseq = new HtmlSequence(url, datems, html);
@@ -342,10 +343,10 @@ public class ServerAccess{
 
         byte[] authBytes = authData.getBytes(ENC_POST);
 
-        OutputStream os = TallyOutputStream.getOutputStream(connection);
-        os.write(authBytes);
-        os.flush();
-        os.close();
+        try(OutputStream os = TallyOutputStream.getOutputStream(connection)){
+            os.write(authBytes);
+            os.flush();
+        }
 
         updateLastAccess(connection);
 
@@ -442,8 +443,9 @@ public class ServerAccess{
             return null;
         }
 
+        String urlTxt = absolute.toString();
         BufferedImage image;
-        image = getImageCache(absolute.toString());
+        image = getImageCache(urlTxt);
         if(image != null) return image;
 
         HttpURLConnection connection =
@@ -465,13 +467,13 @@ public class ServerAccess{
             return null;
         }
 
-        InputStream stream = TallyInputStream.getInputStream(connection);
-        image = ImageIO.read(stream);
-        stream.close();
+        try(InputStream is = TallyInputStream.getInputStream(connection)){
+            image = ImageIO.read(is);
+        }
 
         connection.disconnect();
 
-        putImageCache(absolute.toString(), image);
+        putImageCache(urlTxt, image);
 
         return image;
     }