aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs
diff options
context:
space:
mode:
Diffstat (limited to 'sdkmanager/libs')
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/build/JarListSanitizer.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/JarListSanitizer.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/JarListSanitizer.java
index c6c0c22..fa7b00b 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/build/JarListSanitizer.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/build/JarListSanitizer.java
@@ -364,8 +364,9 @@ public class JarListSanitizer {
private void writeJarList(Map<String, List<JarEntity>> nameMap) {
File cacheFile = new File(mOut, CACHE_FILENAME);
+ OutputStreamWriter writer = null;
try {
- OutputStreamWriter writer = new OutputStreamWriter(
+ writer = new OutputStreamWriter(
new FileOutputStream(cacheFile), "UTF-8");
writer.write("# cache for current jar dependecy. DO NOT EDIT.\n");
@@ -393,14 +394,19 @@ public class JarListSanitizer {
}
}
}
-
- writer.close();
} catch (IOException e) {
mOutStream.println("WARNING: unable to write jarlist cache file " +
cacheFile.getAbsolutePath());
} catch (Sha1Exception e) {
// shouldn't happen here since we check that the sha1 is present first, meaning it's
// already been computing.
+ } finally {
+ if (writer != null) {
+ try {
+ writer.close();
+ } catch (IOException e) {
+ }
+ }
}
}