diff options
| author | John Arthorne | 2009-08-20 17:36:31 +0000 |
|---|---|---|
| committer | John Arthorne | 2009-08-20 17:36:31 +0000 |
| commit | be01dc12f57603ec40a8eb42659f8503c523fcdf (patch) | |
| tree | 1365ff06793e94e61d208aaeb7a65c40afe0a98d /bundles/org.eclipse.equinox.frameworkadmin.equinox | |
| parent | 897bafa7ac9fd23576e0c7fb283fd539bf09aec6 (diff) | |
| download | rt.equinox.p2-be01dc12f57603ec40a8eb42659f8503c523fcdf.tar.gz rt.equinox.p2-be01dc12f57603ec40a8eb42659f8503c523fcdf.tar.xz rt.equinox.p2-be01dc12f57603ec40a8eb42659f8503c523fcdf.zip | |
Bug 285935 [frameworkadmin] Index out of bounds when eclipse.ini contains blank lines
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox')
| -rw-r--r-- | bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java index b952d98de..e5a439fc3 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java @@ -202,6 +202,9 @@ public class FileUtils { throw new URISyntaxException(url, "Not a file url"); } + /** + * Loads an ini file, returning a list of all non-blank lines in the file. + */ public static List loadFile(File file) throws IOException { BufferedReader br = null; try { @@ -210,7 +213,9 @@ public class FileUtils { String line; List list = new ArrayList(); while ((line = br.readLine()) != null) { - list.add(line); + //skip whitespace + if (line.trim().length() > 0) + list.add(line); } return list; } finally { |