diff options
| author | Thomas Watson | 2020-03-12 20:52:08 +0000 |
|---|---|---|
| committer | Thomas Watson | 2020-03-12 20:52:08 +0000 |
| commit | 8f948fcb36eceefd73f7b48ac8661d603e756b8f (patch) | |
| tree | 149c84552625ec1d2116e41af9ec94efff05fbbe | |
| parent | 1d0941092bbedbfbfcd102f01fbe312ff2257257 (diff) | |
| download | rt.equinox.framework-X20200313-0410.tar.gz rt.equinox.framework-X20200313-0410.tar.xz rt.equinox.framework-X20200313-0410.zip | |
Bug 561077 - set install area to user.dir if not loaded from file URLX20200313-0410X20200312-1900I20200323-1800I20200322-1800I20200322-1150I20200322-0300I20200321-1800I20200321-0440I20200320-1800I20200319-1800I20200319-0550I20200318-1800I20200318-1400I20200318-1100I20200317-1800I20200316-1800I20200315-2240I20200315-1800I20200314-1800I20200313-1800I20200313-0810I20200312-1835I20200312-1800
Change-Id: I89aaf5894cf0b8546333f2b7dc1159733cd6cc2d
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java index 2cb16eb89..1781fc0cb 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java @@ -957,8 +957,15 @@ public class EquinoxConfiguration implements EnvironmentInfo { setConfiguration(PROP_FRAMEWORK, externalForm); } if (getConfiguration(EquinoxLocations.PROP_INSTALL_AREA) == null) { - String filePart = getFrameworkPath(url.getPath(), true); - setConfiguration(EquinoxLocations.PROP_INSTALL_AREA, filePart); + String installArea; + if ("file".equals(url.getProtocol())) { //$NON-NLS-1$ + installArea = getFrameworkPath(url.getPath(), true); + } else { + // likely not a full eclipse install, and probably not loaded out of a typical + // URL class loader. Just default to the user dir. + installArea = System.getProperty("user.dir"); //$NON-NLS-1$ + } + setConfiguration(EquinoxLocations.PROP_INSTALL_AREA, installArea); } } // always decode these properties |