Merge "Fixed resource leak in DeviceManager"

1 files changed, 25 insertions, 22 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java
index 3b2d1db..acf9af3 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java
@@ -16,10 +16,25 @@
 
 package com.android.sdklib.devices;
 
+import com.android.prefs.AndroidLocation;
+import com.android.prefs.AndroidLocation.AndroidLocationException;
+import com.android.resources.Keyboard;
+import com.android.resources.KeyboardState;
+import com.android.resources.Navigation;
+import com.android.sdklib.ISdkLog;
+import com.android.sdklib.SdkConstants;
+import com.android.sdklib.devices.Storage.Unit;
+import com.android.sdklib.internal.avd.AvdManager;
+import com.android.sdklib.internal.avd.HardwareProperties;
+import com.android.sdklib.repository.PkgProps;
+
+import org.xml.sax.SAXException;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -31,20 +46,6 @@ import java.util.regex.Pattern;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.xml.sax.SAXException;
-
-import com.android.prefs.AndroidLocation;
-import com.android.prefs.AndroidLocation.AndroidLocationException;
-import com.android.resources.Keyboard;
-import com.android.resources.KeyboardState;
-import com.android.resources.Navigation;
-import com.android.sdklib.ISdkLog;
-import com.android.sdklib.SdkConstants;
-import com.android.sdklib.devices.Storage.Unit;
-import com.android.sdklib.internal.avd.AvdManager;
-import com.android.sdklib.internal.avd.HardwareProperties;
-import com.android.sdklib.repository.PkgProps;
-
 /**
  * Manager class for interacting with {@link Device}s within the SDK
  */
@@ -217,16 +218,18 @@ public class DeviceManager {
         File properties = new File(item, SdkConstants.FN_SOURCE_PROP);
         try {
             BufferedReader propertiesReader = new BufferedReader(new FileReader(properties));
-            String line;
-            while ((line = propertiesReader.readLine()) != null) {
-                Matcher m = sPathPropertyPattern.matcher(line);
-                if (m.matches()) {
-                    return true;
+            try {
+                String line;
+                while ((line = propertiesReader.readLine()) != null) {
+                    Matcher m = sPathPropertyPattern.matcher(line);
+                    if (m.matches()) {
+                        return true;
+                    }
                 }
+            } finally {
+                propertiesReader.close();
             }
-        } catch (IOException e) {
-            return false;
-        }
+        } catch (IOException ignore) { }
         return false;
     }
 }