Changeset 343:7f06d669913d for kraken-linux-api/src/main/java/org/krakenapps/linux/api/MemoryStat.java

Timestamp:

09/18/11 13:55:15 (8 months ago)

Author:

xeraph

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2777

Message:

• fixed potential handle leak bugs.
• added missing license terms

File:

• kraken-linux-api/src/main/java/org/krakenapps/linux/api/MemoryStat.java (modified) (1 diff)

kraken-linux-api/src/main/java/org/krakenapps/linux/api/MemoryStat.java

@@ -220 +220 @@
                 MemoryStat memory = new MemoryStat();
                 BufferedReader br = null;
-
-                br = new BufferedReader(new InputStreamReader(new FileInputStream(new File("/proc/meminfo"))));
-                while (true) {
-                        String line = br.readLine();
-                        if (line == null)
-                                break;
-
-                        parse(memory, line);
+                FileInputStream is = null;
+
+                try {
+                        is = new FileInputStream(new File("/proc/meminfo"));
+                        br = new BufferedReader(new InputStreamReader(is));
+                        while (true) {
+                                String line = br.readLine();
+                                if (line == null)
+                                        break;
+
+                                parse(memory, line);
+                        }
+
+                        return memory;
+                } finally {
+                        if (is != null)
+                                is.close();
+                        if (br != null)
+                                br.close();
                 }
-
-                try {
-                        br.close();
-                } catch (IOException e) {
-                }
-
-                return memory;
         }