additional fixes from issue #3

commonsguy · Nov 28, 2016 · 97ba267 · 97ba267
1 parent 2b763a9
commit 97ba267
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...rity/src/main/java/com/commonsware/cwac/netsecurity/config/ResourceCertificateSource.java b/...rity/src/main/java/com/commonsware/cwac/netsecurity/config/ResourceCertificateSource.java
@@ -66,7 +66,9 @@ private void ensureInitialized() {
                         e);
             } finally {
                 try {
-                    in.close();
+                    if (in!=null) {
+                        in.close();
+                    }
                 } catch (RuntimeException rethrown) {
                     throw rethrown;
                 } catch (Exception ignored) {

diff --git a/...ity/src/main/java/com/commonsware/cwac/netsecurity/conscrypt/TrustedCertificateStore.java b/...ity/src/main/java/com/commonsware/cwac/netsecurity/conscrypt/TrustedCertificateStore.java
@@ -191,7 +191,9 @@ private X509Certificate readCertificate(File file) {
             return null;
         } finally {
             try {
-                is.close();
+                if (is!=null) {
+                    is.close();
+                }
             } catch (RuntimeException rethrown) {
                 throw rethrown;
             } catch (Exception ignored) {
@@ -211,7 +213,9 @@ private void writeCertificate(File file, X509Certificate cert)
             os.write(cert.getEncoded());
         } finally {
             try {
-                os.close();
+                if (os!=null) {
+                    os.close();
+                }
             } catch (RuntimeException rethrown) {
                 throw rethrown;
             } catch (Exception ignored) {