Fix memory leak..

rorist · Jan 25, 2015 · bbb895b · bbb895b
1 parent b693f01
commit bbb895b
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/info/lamatricexiste/network/Network/HardwareAddress.java b/src/info/lamatricexiste/network/Network/HardwareAddress.java
@@ -43,11 +43,12 @@ public HardwareAddress(Activity activity) {
 
     public static String getHardwareAddress(String ip) {
         String hw = NetInfo.NOMAC;
+        BufferedReader bufferedReader = null;
         try {
             if (ip != null) {
                 String ptrn = String.format(MAC_RE, ip.replace(".", "\\."));
                 Pattern pattern = Pattern.compile(ptrn);
-                BufferedReader bufferedReader = new BufferedReader(new FileReader("/proc/net/arp"), BUF);
+                bufferedReader = new BufferedReader(new FileReader("/proc/net/arp"), BUF);
                 String line;
                 Matcher matcher;
                 while ((line = bufferedReader.readLine()) != null) {
@@ -57,13 +58,20 @@ public static String getHardwareAddress(String ip) {
                         break;
                     }
                 }
-                bufferedReader.close();
             } else {
                 Log.e(TAG, "ip is null");
             }
         } catch (IOException e) {
             Log.e(TAG, "Can't open/read file ARP: " + e.getMessage());
             return hw;
+        } finally {
+            try {
+                if(bufferedReader != null) {
+                    bufferedReader.close();
+                }
+            } catch (IOException e) {
+                Log.e(TAG, e.getMessage());
+            }
         }
         return hw;
     }