Close streams

KostyaSha · KostyaSha · commit 6a58761cafc0 · 2015-10-10T17:19:02.000+03:00
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -9,6 +9,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URI;
 import java.util.Collections;
@@ -85,9 +86,9 @@ public class DockerClientConfig implements Serializable {
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
-        try {
+        try (InputStream is = DockerClientConfig.class.getResourceAsStream("/" + DOCKER_IO_PROPERTIES_PROPERTY)) {
             Properties p = new Properties();
-            p.load(DockerClientConfig.class.getResourceAsStream("/" + DOCKER_IO_PROPERTIES_PROPERTY));
+            p.load(is);
             replaceProperties(p, systemProperties);
             return p;
         } catch (IOException e) {
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -57,7 +57,9 @@ public KeystoreSSLConfig(File pfxFile, String password) throws KeyStoreException
         checkNotNull(pfxFile);
         checkNotNull(password);
         keystore = KeyStore.getInstance("pkcs12");
-        keystore.load(new FileInputStream(pfxFile), password.toCharArray());
+        try (FileInputStream fs = new FileInputStream(pfxFile)) {
+            keystore.load(fs, password.toCharArray());
+        }
         keystorePassword = password;
     }
 
