Fix for #7

jezhumble · Mar 21, 2012 · bb0346c · bb0346c
1 parent 7aad2bd
commit bb0346c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/main/java/com/jezhumble/javasysmon/FileUtils.java b/src/main/java/com/jezhumble/javasysmon/FileUtils.java
@@ -50,9 +50,16 @@ public String slurp(String fileName) throws IOException {
     public byte[] slurpToByteArray(String fileName) throws IOException {
         File fileToRead = new File(fileName);
         byte[] contents = new byte[(int) fileToRead.length()];
-        final InputStream inputStream = new FileInputStream(fileToRead);
-        inputStream.read(contents);
-        return contents;
+        InputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(fileToRead);
+            inputStream.read(contents);
+            return contents;
+        } finally {
+            if (inputStream != null) {
+                inputStream.close();
+            }
+        }
     }
 
     /**

diff --git a/src/main/java/com/jezhumble/javasysmon/UnixPasswdParser.java b/src/main/java/com/jezhumble/javasysmon/UnixPasswdParser.java
@@ -9,6 +9,11 @@
 class UnixPasswdParser {
 
     public HashMap parse(BufferedReader reader) {
+        if (reader == null) {
+            System.err.println("Error parsing password file: reader is null");
+            return new HashMap();
+        }
+
         HashMap users = new HashMap();
         try {
             String line;
@@ -22,6 +27,12 @@ public HashMap parse(BufferedReader reader) {
         } catch (IOException e) {
             System.err.println("Error parsing password file: " + e.getMessage());
             return new HashMap();
+        } finally {
+            try {
+                reader.close();
+            } catch (IOException e) {
+                System.err.println("Error closing reader: " + e.getMessage());
+            }
         }
     }