diff options
author | Mykola Nikishov | 2019-05-15 07:31:01 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-10-14 18:46:53 +0000 |
commit | ff4fed126a68244e8e2cbb863c382daab3ca0a00 (patch) | |
tree | 09bbf6bd541415b23d5697d904c0159f7a8bc289 | |
parent | 0a6e3cb22b90d4a5a136989bb57e58dea4d3fa31 (diff) | |
download | rt.equinox.framework-ff4fed126a68244e8e2cbb863c382daab3ca0a00.tar.gz rt.equinox.framework-ff4fed126a68244e8e2cbb863c382daab3ca0a00.tar.xz rt.equinox.framework-ff4fed126a68244e8e2cbb863c382daab3ca0a00.zip |
Report target directory when Main's getBootPath could not find framework
... and throw FileNotFoundException, per method's signature, instead
of RuntimeException.
Change-Id: If6a31b24e0c74af0eb4f80fcc92d2ef8e8dcfe7b
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
3 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF index 497e5d6fa..2902a2ad1 100644 --- a/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true -Bundle-Version: 1.5.500.qualifier +Bundle-Version: 1.5.600.qualifier Main-Class: org.eclipse.equinox.launcher.Main Bundle-ClassPath: . Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.equinox.launcher/pom.xml b/bundles/org.eclipse.equinox.launcher/pom.xml index eec58cea2..4ceb17c0c 100644 --- a/bundles/org.eclipse.equinox.launcher/pom.xml +++ b/bundles/org.eclipse.equinox.launcher/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.launcher</artifactId> - <version>1.5.500-SNAPSHOT</version> + <version>1.5.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java index d013ff7c2..034aa4878 100644 --- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java @@ -969,17 +969,17 @@ public class Main { * @param base the base location * @exception MalformedURLException if a problem occurs computing the class path */ - protected URL[] getBootPath(String base) throws IOException { + private URL[] getBootPath(String base) throws IOException { URL url = null; if (base != null) { url = buildURL(base, true); } else { // search in the root location url = getInstallLocation(); - String path = new File(url.getFile(), "plugins").toString(); //$NON-NLS-1$ - path = searchFor(framework, path); + String pluginsLocation = new File(url.getFile(), "plugins").toString(); //$NON-NLS-1$ + String path = searchFor(framework, pluginsLocation); if (path == null) - throw new RuntimeException("Could not find framework"); //$NON-NLS-1$ + throw new FileNotFoundException(String.format("Could not find framework under %s", pluginsLocation)); //$NON-NLS-1$ if (url.getProtocol().equals("file")) //$NON-NLS-1$ url = new File(path).toURL(); else |