Fix minor errors when used with Eclipse4.

Change-Id: Ia31c45715530f58ac293f61185b5a45f71fab4f5

1 files changed, 17 insertions, 14 deletions

diff --git a/anttasks/src/com/android/ant/DependencyGraph.java b/anttasks/src/com/android/ant/DependencyGraph.java
index ef059b9..4a02aa8 100644
--- a/anttasks/src/com/android/ant/DependencyGraph.java
+++ b/anttasks/src/com/android/ant/DependencyGraph.java
@@ -431,25 +431,28 @@ public class DependencyGraph {
      * @return null if the file could not be read
      */
     private static String readFile(String filepath) {
+        FileInputStream fStream = null;
+        BufferedReader reader = null;
         try {
-            FileInputStream fStream = new FileInputStream(filepath);
-            if (fStream != null) {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(fStream));
-
+            fStream = new FileInputStream(filepath);
+            reader = new BufferedReader(new InputStreamReader(fStream));
+
+            String line;
+            StringBuilder total = new StringBuilder(reader.readLine());
+            while ((line = reader.readLine()) != null) {
+                total.append('\n');
+                total.append(line);
+            }
+            return total.toString();
+        } catch (IOException e) {
+            // we'll just return null
+        } finally {
+            if (reader != null) {
                 try {
-                    String line;
-                    StringBuilder total = new StringBuilder(reader.readLine());
-                    while ((line = reader.readLine()) != null) {
-                        total.append('\n');
-                        total.append(line);
-                    }
-                    return total.toString();
-                } finally {
                     reader.close();
+                } catch (IOException e) {
                 }
             }
-        } catch (IOException e) {
-            // we'll just return null
         }
         return null;
     }