diff options
Diffstat (limited to 'ddms')
3 files changed, 41 insertions, 9 deletions
diff --git a/ddms/app/src/com/android/ddms/Main.java b/ddms/app/src/com/android/ddms/Main.java index 583feb5..6fe69c7 100644 --- a/ddms/app/src/com/android/ddms/Main.java +++ b/ddms/app/src/com/android/ddms/Main.java @@ -144,7 +144,19 @@ public class Main { } else { sourceProp = new File("source.properties"); //$NON-NLS-1$ } - p.load(new FileInputStream(sourceProp)); + FileInputStream fis = null; + try { + fis = new FileInputStream(sourceProp); + p.load(fis); + } finally { + if (fis != null) { + try { + fis.close(); + } catch (IOException ignore) { + } + } + } + sRevision = p.getProperty("Pkg.Revision"); //$NON-NLS-1$ if (sRevision != null && sRevision.length() > 0) { stats.ping("ddms", sRevision); //$NON-NLS-1$ diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/BugReportImporter.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/BugReportImporter.java index 9de1ac7..da41e70 100644 --- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/BugReportImporter.java +++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/BugReportImporter.java @@ -24,14 +24,14 @@ import java.io.InputStreamReader; import java.util.ArrayList; public class BugReportImporter { - + private final static String TAG_HEADER = "------ EVENT LOG TAGS ------"; private final static String LOG_HEADER = "------ EVENT LOG ------"; private final static String HEADER_TAG = "------"; - + private String[] mTags; private String[] mLog; - + public BugReportImporter(String filePath) throws FileNotFoundException { BufferedReader reader = new BufferedReader( new InputStreamReader(new FileInputStream(filePath))); @@ -45,20 +45,27 @@ public class BugReportImporter { } } } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException ignore) { + } + } } } - + public String[] getTags() { return mTags; } - + public String[] getLog() { return mLog; } private void readTags(BufferedReader reader) throws IOException { String line; - + ArrayList<String> content = new ArrayList<String>(); while ((line = reader.readLine()) != null) { if (LOG_HEADER.equals(line)) { @@ -82,8 +89,8 @@ public class BugReportImporter { break; } } - + mLog = content.toArray(new String[content.size()]); } - + } diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/EventLogImporter.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/EventLogImporter.java index a1303f6..011bcf1 100644 --- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/EventLogImporter.java +++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/EventLogImporter.java @@ -47,6 +47,19 @@ public class EventLogImporter { readTags(tagReader); readLog(eventReader); } catch (IOException e) { + } finally { + if (tagReader != null) { + try { + tagReader.close(); + } catch (IOException ignore) { + } + } + if (eventReader != null) { + try { + eventReader.close(); + } catch (IOException ignore) { + } + } } } |