Fixes for Coverity issues of type Resource Leaks - Remaining

1 files changed, 20 insertions, 3 deletions

diff --git a/base/util/src/netscape/security/x509/OIDMap.java b/base/util/src/netscape/security/x509/OIDMap.java
index 17573a019..4cebcf2c8 100644
--- a/base/util/src/netscape/security/x509/OIDMap.java
+++ b/base/util/src/netscape/security/x509/OIDMap.java
@@ -165,12 +165,20 @@ public class OIDMap {
         if (!namesMap.exists()) {
             loadNamesDefault(props);
         } else {
+            FileInputStream fis = null;
             try {
-                FileInputStream fis = new FileInputStream(namesMap);
+                fis = new FileInputStream(namesMap);
                 props.load(fis);
-                fis.close();
             } catch (IOException e) {
                 loadNamesDefault(props);
+            } finally {
+                if (fis != null) {
+                    try {
+                        fis.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
             }
         }
 
@@ -193,11 +201,20 @@ public class OIDMap {
         if (!classMap.exists()) {
             loadClassDefault(props);
         } else {
+            FileInputStream fis = null;
             try {
-                FileInputStream fis = new FileInputStream(classMap);
+                fis = new FileInputStream(classMap);
                 props.load(fis);
             } catch (IOException e) {
                 loadClassDefault(props);
+            } finally {
+                if (fis != null) {
+                    try {
+                        fis.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
             }
         }